(Bug 23767) - PHP warning/error when REQUEST_URI returns blank (IIS issue)

diff --git a/HISTORY b/HISTORY
index 0ec09c0..30f8ace 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -875,6 +875,7 @@ changes to languages because of MediaZilla reports.
 * (bug 19968) Fixed "Project talk" namespace name for Maltese (mt)
 * (bug 21168) Added áâãàéêçíóôõúü to Portuguese (pt) linktrail
 * (bug 21596) Change interwiki link for Kurdish (ku)
+* (bug 23767) PHP warning/error when REQUEST_URI returns blank (IIS issue).
 
 == MediaWiki 1.15 ==
 

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 654e92d..684596b 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -460,7 +460,7 @@ class WebRequest {
         * @return String
         */
        public function getRequestURL() {
-               if( isset( $_SERVER['REQUEST_URI'] ) ) {
+               if( isset( $_SERVER['REQUEST_URI']) && strlen($_SERVER['REQUEST_URI']) ) {
                        $base = $_SERVER['REQUEST_URI'];
                } elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) {
                        // Probably IIS; doesn't set REQUEST_URI