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

zendframework · Jul 17, 2012 · 07c51ae · 07c51ae
6 parents b2ba0b2 + 3df4d2a + 24b691f + d37df59 + 7f0c1ad + 25ddb64
commit 07c51ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Server.php b/src/Server.php
@@ -600,12 +600,12 @@ protected function registerSystemMethods()
      */
     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;
         }