Changeset 13077

Timestamp:

12/15/11 20:44:36 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 13075-13076 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.10

........

r13075 | p_lindheimer | 2011-12-15 16:41:42 -0800 (Thu, 15 Dec 2011) | 1 line

fixes #5475 force fpbx_framework_autoloader(true) if a module says it needs Zend

........

r13076 | p_lindheimer | 2011-12-15 16:43:10 -0800 (Thu, 15 Dec 2011) | 1 line

re #5475 initialize force_autoload

........

Files:

• freepbx/branches/2.9 (modified) (2 props)
• freepbx/branches/2.9/amp_conf/htdocs/admin/bootstrap.php (modified) (1 diff)

freepbx/branches/2.9/amp_conf/htdocs/admin/bootstrap.php

@@ -146 +146 @@
-  if(is_array($active_modules)){
-
+    $force_autoload = false;
-    foreach($active_modules as $key => $module) {
-      //include module functions if there not dissabled
-      if ((!$restrict_mods_local || (is_array($restrict_mods_local) && isset($restrict_mods_local[$key]))) && is_file($amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php")) {
-        require_once($amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php");
+
+        // Zend appears to break class auto-loading. Therefore, if we detect there is a module that requires Zend 
+        // we will include all the potential classes at this point.
+        //
+        if (!$force_autoload && isset($module['depends']['phpcomponent']) && stristr($module['depends']['phpcomponent'], 'zend')) {
+          fpbx_framework_autoloader(true);
+          $force_autoload = true;
+        }
-      } 
-      //create an array of module sections to display