From 738b967b7ca1c3c4687736c43df8c796e61af96b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 15 Feb 2007 23:40:05 +0000
Subject: [PATCH] * (bug 8992) Fix a remaining raw use of REQUEST_URI in
 history

---
 RELEASE-NOTES     | 2 ++
 includes/Wiki.php | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4a06b02d96..49e50e2782 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -186,6 +186,8 @@ lighter making things easier to read.
   for better localisations.
 * (bug 8944) The deprecated is_a() function is used in StubObjects.php
 * (bug 8978) Georgian i18n update
+* (bug 8992) Fix a remaining raw use of REQUEST_URI in history
+
 
 == Languages updated ==
 
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 85963f5b82..9437ce40f9 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -422,7 +422,8 @@ class MediaWiki {
 				}
 				break;
 			case 'history':
-				if( $_SERVER['REQUEST_URI'] == $title->getInternalURL( 'action=history' ) ) {
+				global $wgRequest;
+				if( $wgRequest->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
 					$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
 				}
 				$history = new PageHistory( $article );
-- 
2.20.1