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

[RequestHandler] fixed warning when baseUrl is empty

Browse Source
This commit is contained in:
Fabien Potencier 2010-04-06 10:00:46 +02:00
parent 12690a8e92
commit 229b0cea31
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Components/RequestHandler/Request.php
View File

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