From: Jack D. Pond <jdpond@users.mediawiki.org>
Date: Thu, 10 Jun 2010 19:00:07 +0000 (+0000)
Subject: (Bug 23767) - PHP warning/error when REQUEST_URI returns blank (IIS issue)
X-Git-Tag: 1.31.0-rc.0~36546
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=eb03fbf100bfb6facf510286099b22153da4f07b;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/HISTORY b/HISTORY
index 0ec09c0871..30f8ace63e 100644
--- 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 654e92d93f..684596b20b 100644
--- 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