Merge branch 'feature/di' into local-rs/feature/di

zendframework · Jul 13, 2011 · f7defb5 · f7defb5
8 parents 26666c9 + c993e85 + 4e037a4 + 965637a + 64de913 + b400e6b + 6186985 + 526722c
commit f7defb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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;
     }
 

diff --git a/tools/phptools b/tools/phptools