r67828 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67827‎ | r67828 | r67829 >
Date:19:00, 10 June 2010
Author:jdpond
Status:ok
Tags:
Comment:
(Bug 23767) - PHP warning/error when REQUEST_URI returns blank (IIS issue)
Modified paths:
  • /trunk/phase3/HISTORY (modified) (history)
  • /trunk/phase3/includes/WebRequest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/HISTORY
@@ -875,6 +875,7 @@
876876 * (bug 19968) Fixed "Project talk" namespace name for Maltese (mt)
877877 * (bug 21168) Added áâãàéêçíóôõúü to Portuguese (pt) linktrail
878878 * (bug 21596) Change interwiki link for Kurdish (ku)
 879+* (bug 23767) PHP warning/error when REQUEST_URI returns blank (IIS issue).
879880
880881 == MediaWiki 1.15 ==
881882
Index: trunk/phase3/includes/WebRequest.php
@@ -460,7 +460,7 @@
461461 * @return String
462462 */
463463 public function getRequestURL() {
464 - if( isset( $_SERVER['REQUEST_URI'] ) ) {
 464+ if( isset( $_SERVER['REQUEST_URI']) && strlen($_SERVER['REQUEST_URI']) ) {
465465 $base = $_SERVER['REQUEST_URI'];
466466 } elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) {
467467 // Probably IIS; doesn't set REQUEST_URI

Status & tagging log