Merge remote-tracking branch 'weierophinney/hotfix/is-subclass-of-opt…

…imization'
zendframework · Jul 13, 2012 · 4daeba0 · 4daeba0
5 parents 660eb19 + 587b0dd + 13e8cbe + 7100033 + 9d78e4a
commit 4daeba0
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;
         }