* (bug 8992) Fix a remaining raw use of REQUEST_URI in history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4a06b02..49e50e2 100644 (file)
--- 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 85963f5..9437ce4 100644 (file)
--- 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 );