Commit 26e85436 authored by Fabien Potencier's avatar Fabien Potencier

changed charset to have a sensible default in all providers

parent 34524a52
......@@ -42,7 +42,7 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList
});
$app['fragment.renderer.hinclude'] = $app->share(function ($app) {
$renderer = new HIncludeFragmentRenderer(null, $app['uri_signer'], $app['fragment.renderer.hinclude.global_template'], $app['charset']);
$renderer = new HIncludeFragmentRenderer(null, $app['uri_signer'], $app['fragment.renderer.hinclude.global_template'], isset($app['charset']) ? $app['charset'] : 'UTF-8');
$renderer->setFragmentPath($app['fragment.path']);
return $renderer;
......
......@@ -37,7 +37,7 @@ class TwigServiceProvider implements ServiceProviderInterface
$app['twig'] = $app->share(function ($app) {
$app['twig.options'] = array_replace(
array(
'charset' => $app['charset'],
'charset' => isset($app['charset']) ? $app['charset'] : 'UTF-8',
'debug' => isset($app['debug']) ? $app['debug'] : false,
'strict_variables' => isset($app['debug']) ? $app['debug'] : false,
), $app['twig.options']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment