Merge branch 'master' of git://github.com/zendframework/zf2

Conflicts: .gitignore
zendframework · Jul 29, 2011 · e938c5f · e938c5f
11 parents 00ab860 + 6186985 + 26666c9 + c993e85 + 4e037a4 + 965637a + 64de913 + b400e6b + 526722c + f7defb5 + 1f1e802
commit e938c5f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 484 deletions.
diff --git a/src/StandardAutoloader.php b/src/StandardAutoloader.php
@@ -223,20 +223,22 @@ public function autoload($class)
         if (false !== strpos($class, self::NS_SEPARATOR)) {
             if ($this->loadClass($class, self::LOAD_NS)) {
                 return $class;
-            } elseif ($this->isFallbackAutoloader()) {
+            } elseif ($isFallback) {
                 return $this->loadClass($class, self::ACT_AS_FALLBACK);
             }
             return false;
         }
         if (false !== strpos($class, self::PREFIX_SEPARATOR)) {
             if ($this->loadClass($class, self::LOAD_PREFIX)) {
                 return $class;
-            } elseif ($this->isFallbackAutoloader()) {
+            } elseif ($isFallback) {
                 return $this->loadClass($class, self::ACT_AS_FALLBACK);
             }
             return false;
         }
-                return $this->loadClass($class, self::ACT_AS_FALLBACK);
+        if ($isFallback) {
+            return $this->loadClass($class, self::ACT_AS_FALLBACK);
+        }
         return false;
     }