Merge branch 'feature/fix-dispatch-stage' into develop

proem · Jun 26, 2012 · e839b4d · e839b4d
2 parents 54f7933 + f57af6b
commit e839b4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Proem/Api/Dispatch/Stage.php b/lib/Proem/Api/Dispatch/Stage.php
@@ -151,6 +151,9 @@ protected function processRoutes()
                         }
                     }
                 ]);
+                if ($dispatched) {
+                    break;
+                }
             }
 
             if (!$dispatched) {

diff --git a/lib/Proem/Api/Dispatch/Standard.php b/lib/Proem/Api/Dispatch/Standard.php
@@ -159,7 +159,7 @@ public function isDispatchable()
             if (class_exists($this->class)) {
                 $this->class = new $this->class($this->assets);
                 if ($this->class instanceof \Proem\Controller\Template) {
-                    if (is_callable($this->class, $this->action . 'Action')) {
+                    if (is_callable([$this->class, $this->action . 'Action'])) {
                         return true;
                     }
                 }