From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Thu, 9 Dec 2010 03:12:28 +0000 (+0000)
Subject: Follow-up to r64937: expand ternary to conditionals because I hate nested ternaries.
X-Git-Tag: 1.31.0-rc.0~33426
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=25289a20a2fd459ab441c3d18f05bf9a50751231;p=lhc%2Fweb%2Fwiklou.git

Follow-up to r64937: expand ternary to conditionals because I hate nested ternaries.
---

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 ) {