From: Tim Starling Date: Sat, 12 May 2007 19:25:25 +0000 (+0000) Subject: a couple of fixes X-Git-Tag: 1.31.0-rc.0~52934 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=c999082474791de0681442a5695fe85e611b11d9;p=lhc%2Fweb%2Fwiklou.git a couple of fixes --- diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 53273a22e1..6e9836e590 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -46,13 +46,32 @@ class WebRequest { $this->checkMagicQuotes(); global $wgUsePathInfo; if ( $wgUsePathInfo ) { - if ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) { + // PATH_INFO is mangled due to http://bugs.php.net/bug.php?id=31892 + // And also by Apache 2.x, double slashes are converted to single slashes. + // So we will use REQUEST_URI if possible. + $title = ''; + if ( !empty( $_SERVER['REQUEST_URI'] ) ) { + global $wgArticlePath; + $url = $_SERVER['REQUEST_URI']; + if ( !preg_match( '!^https?://!', $url ) ) { + $url = 'http://unused' . $url; + } + $a = parse_url( $url ); + // Find the part after $wgArticlePath + $base = str_replace( '$1', '', $wgArticlePath ); + if ( $a && substr( $a['path'], 0, strlen( $base ) ) == $base ) { + $title = urldecode( substr( $a['path'], strlen( $base ) ) ); + } + } elseif ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) { # Mangled PATH_INFO # http://bugs.php.net/bug.php?id=31892 # Also reported when ini_get('cgi.fix_pathinfo')==false - $_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['ORIG_PATH_INFO'], 1 ); + $title = substr( $_SERVER['ORIG_PATH_INFO'], 1 ); } elseif ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) { - $_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['PATH_INFO'], 1 ); + $title = substr( $_SERVER['PATH_INFO'], 1 ); + } + if ( strval( $title ) != '' ) { + $_GET['title'] = $_REQUEST['title'] = $title; } } }