2
0
Prechádzať zdrojové kódy

ZF-6660: Disable class_exists() autoloader in Zend_Gdata_App::__call() and
Zend_Gdata_Gapps::__call() for compatibility with magic factories.

This corrects a bug that was introduced by r15576.

Found by: jeffrey (Jeffrey Sambells)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16265 44c647ce-9c0f-0410-b52a-842ac1e357ba

tjohns 16 rokov pred
rodič
commit
7d205fe3ec

+ 3 - 1
library/Zend/Gdata/App.php

@@ -1020,7 +1020,9 @@ class Zend_Gdata_App
             $foundClassName = null;
             foreach ($this->_registeredPackages as $name) {
                  try {
-                     if (!class_exists($name . '_' . $class)) {
+                     // Autoloading disabled on next line for compatibility
+                     // with magic factories. See ZF-6660.
+                     if (!class_exists($name . '_' . $class, false)) {
                         require_once 'Zend/Loader.php';
                         @Zend_Loader::loadClass($name . '_' . $class);
                      }

+ 3 - 1
library/Zend/Gdata/Gapps.php

@@ -624,7 +624,9 @@ class Zend_Gdata_Gapps extends Zend_Gdata
             $foundClassName = null;
             foreach ($this->_registeredPackages as $name) {
                  try {
-                     if (!class_exists($name . '_' . $class)) {
+                     // Autoloading disabled on next line for compatibility
+                     // with magic factories. See ZF-6660.
+                     if (!class_exists($name . '_' . $class, false)) {
                         require_once 'Zend/Loader.php';
                         @Zend_Loader::loadClass($name . '_' . $class);
                      }