* Fix WebRequest::getRequestURL() to strip off the host bits squid prepends

Corrects self-link in Atom 1.0 feeds.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d569a51..8dd1d55 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -208,6 +208,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3666) Don't spew PHP warnings in prefs on unrecognized site language
 * (bug 2392) Fix Atom items content type, upgrade to Atom 1.0
 * Allow $wgFeedCacheTimeout of 0 to disable feed caching
+* Fix WebRequest::getRequestURL() to strip off the host bits squid prepends
 
 === Caveats ===
 

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 2407718..400392f 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -281,7 +281,13 @@ class WebRequest {
         * @return string
         */
        function getRequestURL() {
-               return $_SERVER['REQUEST_URI'];
+               $base = $_SERVER['REQUEST_URI'];
+               if( $base{0} == '/' ) {
+                       return $base;
+               } else {
+                       // We may get paths with a host prepended; strip it.
+                       return preg_replace( '!^[^:]+://[^/]+/!', '/', $base );
+               }
        }
        
        /**