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

zendframework · Jul 17, 2012 · d3a95e2 · d3a95e2
6 parents 67c3033 + 533cd3e + 180e140 + 29e7718 + 936c9be + 2d11657
commit d3a95e2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
@@ -193,12 +193,12 @@ protected function createFromInvokable($canonicalName, $requestedName)
      */
     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;
         }