TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes PHP Warning: strpos(): Empty needle

Browse Source
This commit is contained in:
Franck Allimant
2014-04-17 00:17:37 +02:00
parent feeff10bd1
commit b3d857c31b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Tools/URL.php
View File

@@ -141,7 +141,9 @@ class URL
// As base URL also contains /thelia2 (e.g. http://some.server.com/thelia2), we end up with // As base URL also contains /thelia2 (e.g. http://some.server.com/thelia2), we end up with
// http://some.server.com/thelia2/thelia2/my/path, instead of http://some.server.com/thelia2/my/path // http://some.server.com/thelia2/thelia2/my/path, instead of http://some.server.com/thelia2/my/path
// We have to compensate for this. // We have to compensate for this.
$hasSubdirectory = 0 === strpos($path, $this->requestContext->getBaseUrl()); $rcbu = $this->requestContext->getBaseUrl();
$hasSubdirectory = ! empty($rcbu) && (0 === strpos($path, $rcbu));
$base_url = $this->getBaseUrl($hasSubdirectory); $base_url = $this->getBaseUrl($hasSubdirectory);