Changeset 4598

Timestamp:

08/22/10 22:49:05 (18 months ago)

Author:

vain

Message:

• fix for method detection in dispatchable()

Location:

trunk/core

Files:

• bootstrap/clansuite.application.php (modified) (3 diffs)
• router.core.php (modified) (1 diff)

trunk/core/bootstrap/clansuite.application.php

@@ -31 +31 @@
     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005 - onwards)
     * @link       http://www.clansuite.com
-    * 
+    *
     * @version    SVN: $Id$
     */
@@ -42 +42 @@
 
 # Security Handler
-if (defined('IN_CS') == false)
+if (defined('IN_CS') === false)
 {
     die('Clansuite not loaded. Direct Access forbidden.');
@@ -541 +541 @@
         $response = self::$injector->instantiate('Clansuite_HttpResponse');
 
-
         /**
          * Setup Frontcontroller and pass Request and Response

trunk/core/router.core.php

@@ -1054 +1054 @@
             if(class_exists($classname, false))
             {
-                # WATCH IT! method_exists works on objects, is_callable on classes! ,)
-                if(is_callable($classname, $method))
+                # WATCH IT!
+                # method_exists works on objects? i just have a classname
+                # is_callable on classes ?!
+                # @todo how to get the object back for a classname?
+                if(true === in_array($method, get_class_methods($classname)))
                 {
-                      Clansuite_Debug::firebug('(OK) Route is dispatchable: '. $filename .' '. $classname .'->'. $method);
+                      #Clansuite_Debug::firebug('(OK) Route is dispatchable: '. $filename .' '. $classname .'->'. $method);
                       return true;
                 }
-                else
-                {
-                    return false;
-                }
             }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            Clansuite_Debug::firebug('(ERROR) Route not dispatchable: '. $filename .' '. $classname .'->'. $method);
-            return false;
-        }
+        }
+
+        #Clansuite_Debug::firebug('(ERROR) Route not dispatchable: '. $filename .' '. $classname .'->'. $method);
+        return false;
     }