| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -217,9 +217,14 @@ |
| 218 | 218 | wfDebug( "Start request\n\n" ); |
| 219 | 219 | # Output the REQUEST_URI. This is not supported by IIS in rewrite mode, |
| 220 | 220 | # so use an alternative |
| 221 | | - $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : |
| 222 | | - ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] : |
| 223 | | - $_SERVER['PHP_SELF'] ); |
| | 221 | + if ( isset( $_SERVER['REQUEST_URI'] ) ) { |
| | 222 | + $requestUri = $_SERVER['REQUEST_URI']; |
| | 223 | + } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) { |
| | 224 | + $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; |
| | 225 | + } else { |
| | 226 | + $requestUri = $_SERVER['PHP_SELF']; |
| | 227 | + } |
| | 228 | + |
| 224 | 229 | wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" ); |
| 225 | 230 | |
| 226 | 231 | if ( $wgDebugPrintHttpHeaders ) { |