From 1ebefd7eff86e928e929faf95d2ab0c94464fefc Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Tue, 20 Nov 2007 23:53:53 +0000
Subject: [PATCH] merge changest 35230

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45248 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/HTTP.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/HTTP.php b/core/HTTP.php
index be29bf28e..7ca6ac366 100644
--- a/core/HTTP.php
+++ b/core/HTTP.php
@@ -35,6 +35,7 @@ class HTTP {
 	 * Turn all relative URLs in the content to absolute URLs
 	 */
 	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 )' );
 	}