Christophe Coevoet преди 13 години
родител
ревизия
9bc41d00d1
променени са 2 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 1 1
      src/Symfony/Component/HttpFoundation/Request.php
  2. 1 0
      tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php

+ 1 - 1
src/Symfony/Component/HttpFoundation/Request.php

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

+ 1 - 0
tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php

@@ -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')));