Explorar o código

[RequestHandler] fixed warning when baseUrl is empty

Fabien Potencier %!s(int64=15) %!d(string=hai) anos
pai
achega
229b0cea31
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      src/Symfony/Components/RequestHandler/Request.php

+ 2 - 2
src/Symfony/Components/RequestHandler/Request.php

@@ -642,13 +642,13 @@ class Request implements RequestInterface
     // Does the baseUrl have anything in common with the request_uri?
     $requestUri = $this->getRequestUri();
 
-    if (0 === strpos($requestUri, $baseUrl))
+    if ($baseUrl && 0 === strpos($requestUri, $baseUrl))
     {
       // full $baseUrl matches
       return $baseUrl;
     }
 
-    if (0 === strpos($requestUri, dirname($baseUrl)))
+    if ($baseUrl && 0 === strpos($requestUri, dirname($baseUrl)))
     {
       // directory portion of $baseUrl matches
       return rtrim(dirname($baseUrl), '/');