Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · 86e6515 · 86e6515
6 parents 660eb19 + 587b0dd + 4daeba0 + 13e8cbe + 7100033 + 50b1c92
commit 86e6515
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/AutoloaderFactory.php b/src/AutoloaderFactory.php
@@ -208,12 +208,12 @@ protected static function getStandardAutoloader()
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
-            return is_subclass_of($className, $type);
-        }
         if (is_subclass_of($className, $type)) {
             return true;
         }
+        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+            return false;
+        }
         if (!interface_exists($type)) {
             return false;
         }