http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72337
Revision: 72337
Author: mah
Date: 2010-09-04 00:18:01 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
re r72335: forgot to include this 'global' keyword.
Modified Paths:
--------------
trunk/phase3/includes/Setup.php
Modified: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php 2010-09-04 00:03:45 UTC (rev 72336)
+++ trunk/phase3/includes/Setup.php 2010-09-04 00:18:01 UTC (rev 72337)
@@ -173,7 +173,7 @@
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 @@
$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" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
