mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-01 07:17:48 +02:00
merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45248 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
8a143aaf9a
commit
1ebefd7eff
@ -35,6 +35,7 @@ class HTTP {
|
|||||||
* Turn all relative URLs in the content to absolute URLs
|
* Turn all relative URLs in the content to absolute URLs
|
||||||
*/
|
*/
|
||||||
static function absoluteURLs($html) {
|
static function absoluteURLs($html) {
|
||||||
|
$html = str_replace('$CurrentPageURL', $_SERVER['REQUEST_URI'], $html);
|
||||||
return HTTP::urlRewriter($html, '(substr($URL,0,1) == "/") ? ( Director::protocolAndHost() . $URL ) : ( (ereg("^[A-Za-z]+:", $URL)) ? $URL : Director::absoluteBaseURL() . $URL )' );
|
return HTTP::urlRewriter($html, '(substr($URL,0,1) == "/") ? ( Director::protocolAndHost() . $URL ) : ( (ereg("^[A-Za-z]+:", $URL)) ? $URL : Director::absoluteBaseURL() . $URL )' );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user