update symfony vendor, fix response conversion

3a827f20 · Igor Wiedler · e43f0912 · 3a827f20 · a5bac4b5
Commit 3a827f20 authored Feb 16, 2011 by Igor Wiedler
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/Silex/Framework.php src/Silex/Framework.php +5 -1

src/vendor/symfony src/vendor/symfony +1 -1

No files found.
--- a/src/Silex/Framework.php
+++ b/src/Silex/Framework.php
@@ -310,8 +310,12 @@ class Framework extends HttpKernel
     */
    public function parseStringResponse(Event $event, $response)
    {
+        if ($response instanceof Response) {
+            return $response;
+        } else {
            return new Response((string) $response);
        }
+    }
    /**
     * Handler for core.view

--- a/symfony @ a5bac4b5
+++ b/symfony @ a5bac4b5
-Subproject commit a72145bf5f72ca9568262425df0fa3942738af93
+Subproject commit a5bac4b5a3036d80d68c850a858ed08fad41a918