Merge branch 'release-0.5.1'

proem · Jun 26, 2012 · f7b67ed · f7b67ed
2 parents 9366273 + d861a25
commit f7b67ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
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;
                     }
                 }

diff --git a/lib/Proem/Api/IO/Response/Http/Standard.php b/lib/Proem/Api/IO/Response/Http/Standard.php
@@ -252,7 +252,7 @@ public function appendToBody($string)
         $string = (string) $string;
         $this->length += strlen($string);
         $this->body .= $string;
-        $this->headers->set('Content-Length', $this->length);
+        //$this->headers->set('Content-Length', $this->length);
         return $this;
     }
 

diff --git a/lib/Proem/Api/Proem.php b/lib/Proem/Api/Proem.php
@@ -52,7 +52,7 @@ class Proem
     /**
      * Store the framework version
      */
-    const VERSION = '0.5.0';
+    const VERSION = '0.5.1';
 
     /**
      * Store events