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

Fixed URL::absoluteUrl()

Browse Source
This commit is contained in:
franck
2013-08-30 19:56:24 +02:00
parent a2d6c16d13
commit d9d8190fa6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,15 +55,15 @@ class URL
/** /**
* @etienne : can't be done here for it's already done in ::viewUrl / ::adminViewUrl * @etienne : can't be done here for it's already done in ::viewUrl / ::adminViewUrl
* @franck : should be done, as absoluteUrl() is sometimes called directly (see UrlGenerator::generateUrlFunction())
*/ */
//$root = $path_only == self::PATH_TO_FILE ? ConfigQuery::read('base_url', '/') : self::getIndexPage(); $root = $path_only == self::PATH_TO_FILE ? ConfigQuery::read('base_url', '/') : self::getIndexPage();
$root = $path_only == self::PATH_TO_FILE ? ConfigQuery::read('base_url', '/') : ''; //$root = $path_only == self::PATH_TO_FILE ? ConfigQuery::read('base_url', '/') : '';
$base = rtrim($root, '/') . '/' . ltrim($path, '/'); $base = rtrim($root, '/') . '/' . ltrim($path, '/');
} else } else
$base = $path; $base = $path;
$queryString = ''; $queryString = '';
if (! is_null($parameters)) { if (! is_null($parameters)) {