Changeset 2945:d72e6de6395d

Timestamp:

01/30/15 17:33:59 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Should also not load _admin.php/_public.php/_xmlrpc.php if _prepend.php of module returns null

Location:

inc/core

Files:

• class.dc.modules.php (modified) (3 diffs)
• class.dc.themes.php (modified) (1 diff)

inc/core/class.dc.modules.php

@@ -69 +69 @@
           $disabled = isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'];
           $disabled = $disabled && !get_parent_class($this) ? true : false;
+
+          $ignored = array();
 
           foreach ($this->path as $root)
@@ -123 +125 @@
                     # If _prepend.php file returns null (ie. it has a void return statement)
                     if (is_null($r)) {
+                         $ignored[] = $id;
                          continue;
                     }
@@ -136 +139 @@
           foreach ($this->modules as $id => $m)
           {
+               # If _prepend.php file returns null (ie. it has a void return statement)
+               if (in_array($id,$ignored)) {
+                    continue;
+               }
                # Load ns_file
                $this->loadNsFile($id,$ns);

inc/core/class.dc.themes.php

@@ -42 +42 @@
      @param    version        <b>string</b>       Module version
      @param    properties     <b>array</b>        extra properties
-     (currently available keys : parent, priority, standalone_config, type)
+     (currently available keys : parent, priority, standalone_config, type, tplset)
      */
      public function registerModule($name,$desc,$author,$version,$properties = array())