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

merged branch stof/issue_3053 (PR #3054)

Browse Source 
Commits
-------

9bc41d0 [HttpFoundation] Fixed #3053

Discussion
----------

[HttpFoundation] Fixed #3053
This commit is contained in:
Fabien Potencier 2012-01-07 16:40:58 +01:00
commit 4f1edb50d8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -931,7 +931,7 @@ class Request
{
$preferredLanguages = $this->getLanguages();
if (null === $locales) {
if (empty($locales)) {
return isset($preferredLanguages[0]) ? $preferredLanguages[0] : null;
}

1
tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
View File

@ -719,6 +719,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
{
$request = new Request();
$this->assertEquals('', $request->getPreferredLanguage());
$this->assertEquals('', $request->getPreferredLanguage(array()));
$this->assertEquals('fr', $request->getPreferredLanguage(array('fr')));
$this->assertEquals('fr', $request->getPreferredLanguage(array('fr', 'en')));
$this->assertEquals('en', $request->getPreferredLanguage(array('en', 'fr')));