From 25289a20a2fd459ab441c3d18f05bf9a50751231 Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Thu, 9 Dec 2010 03:12:28 +0000 Subject: [PATCH] Follow-up to r64937: expand ternary to conditionals because I hate nested ternaries. --- includes/Setup.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index 7c9fa49031..d28b339ef7 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -217,9 +217,14 @@ if ( $wgCommandLineMode ) { wfDebug( "Start request\n\n" ); # Output the REQUEST_URI. This is not supported by IIS in rewrite mode, # so use an alternative - $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : - ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] : - $_SERVER['PHP_SELF'] ); + if ( isset( $_SERVER['REQUEST_URI'] ) ) { + $requestUri = $_SERVER['REQUEST_URI']; + } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) { + $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; + } else { + $requestUri = $_SERVER['PHP_SELF']; + } + wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" ); if ( $wgDebugPrintHttpHeaders ) { -- 2.20.1