tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3323 from dhensby/patch-2

Browse Source 
FIX Handle empty URLs that are made absolute
This commit is contained in:
Sean Harvey 2014-07-30 15:42:34 +12:00
commit 76f719c94b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/Director.php
View File

@ -425,7 +425,7 @@ class Director implements TemplateGlobalProvider {
}
if(substr($url,0,4) != "http") {
if($url[0] != "/") $url = Director::baseURL() . $url;
if(strpos($url, '/') !== 0) $url = Director::baseURL() . $url;
// Sometimes baseURL() can return a full URL instead of just a path
if(substr($url,0,4) != "http") $url = self::protocolAndHost() . $url;
}