diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch vlechemin/ticket_3472 (PR #3473)

Browse Source 
Commits
-------

ab47a88 [FrameworkBundle][Translator] Fix test for request being available in order to get the locale.

Discussion
----------

[FrameworkBundle][Translator] Fix test for request being available.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #3472
Todo: -
This commit is contained in:
Fabien Potencier 2012-06-27 20:31:58 +02:00
commit e8c0e07841
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
View File

@ -65,7 +65,7 @@ class Translator extends BaseTranslator
*/
public function getLocale()
{
if (null === $this->locale && $this->container->has('request')) {
if (null === $this->locale && $this->container->isScopeActive('request')) {
$this->locale = $this->container->get('request')->getLocale();
}