From c5caf7d35eca6348d5b2a8f9bcdcf671a59a33a4 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Sat, 4 Sep 2010 00:18:01 +0000 Subject: [PATCH] re r72335: forgot to include this 'global' keyword. --- includes/Setup.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index fa3296d241..6bf163efb5 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -173,7 +173,7 @@ wfProfileIn( $fname.'-misc1' ); wfMemoryLimit(); /** - * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+ + * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+ * that happens whenever you use a date function without the timezone being * explicitly set. Inspired by phpMyAdmin's treatment of the problem. */ @@ -186,13 +186,14 @@ $wgIP = false; # Load on demand $wgRequest = new WebRequest; # Useful debug output +global $wgCommandLineMode; if ( $wgCommandLineMode ) { wfDebug( "\n\nStart command line script $self\n" ); } else { 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'] : + $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] : $_SERVER['PHP_SELF'] ); wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" ); -- 2.20.1