From de7b4d73c61f7ee2423773263384e0e43e1f5ad6 Mon Sep 17 00:00:00 2001 From: Pavel Batanov Date: Sat, 9 Jan 2016 09:10:09 +0300 Subject: [PATCH] Fix #17306 Paths with % in it are note allowed (like urlencoded) --- .../DependencyInjection/FrameworkExtension.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index de97b1f44c..4248623d3d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -562,17 +562,17 @@ class FrameworkExtension extends Extension $dirs[] = dirname($r->getFileName()).'/../../Resources/translations'; } } - $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations'; + $rootDir = $container->getParameter('kernel.root_dir'); foreach ($container->getParameter('kernel.bundles') as $bundle => $class) { $reflection = new \ReflectionClass($class); if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) { $dirs[] = $dir; } - if (is_dir($dir = sprintf($overridePath, $bundle))) { + if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) { $dirs[] = $dir; } } - if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) { + if (is_dir($dir = $rootDir.'/Resources/translations')) { $dirs[] = $dir; }