Merge branch '2.3'

fabpot · fabpot · commit 67ef8d4a7f87 · 2013-07-08T15:37:01.000+02:00
* 2.3: Update JsonResponse.php [HttpKernel] fixed the inline renderer when passing objects as attributes (closes symfony#7124) CookieJar remove unneeded var, Client remove unneeded else [DI] Fixed bug requesting non existing service from dumped frozen container Update validators.sk.xlf [WebProfiler] fix content-type parameter Replace romaji period characters with Japanese style zenkaku period characters fixed CS fixed CS [Console] Avoided an unnecessary check. Added missing French validator translations typo first->second Passed the config when building the Configuration in ConfigurableExtension removed unused code Fixed variable name used in translation cache Conflicts: src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -93,10 +93,10 @@ public function cssAction($token)
         if (!$this->templateExists($template)) {
             $handler = new ExceptionHandler();
 
-            return new Response($handler->getStylesheet($exception));
+            return new Response($handler->getStylesheet($exception), 200, array('Content-Type' => 'text/css'));
         }
 
-        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, 'text/css');
+        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, array('Content-Type' => 'text/css'));
     }
 
     protected function getTemplate()

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ public function cssAction($token)`
`93`	`93`	`if (!$this->templateExists($template)) {`
`94`	`94`	`$handler = new ExceptionHandler();`
`95`	`95`
`96`		`- return new Response($handler->getStylesheet($exception));`
	`96`	`+ return new Response($handler->getStylesheet($exception), 200, array('Content-Type' => 'text/css'));`
`97`	`97`	`}`
`98`	`98`
`99`		`- return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, 'text/css');`
	`99`	`+ return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, array('Content-Type' => 'text/css'));`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`protected function getTemplate()`