If $_SERVER['REMOTE_ADDR'] is not set, use 127.0.0.1 for $wgIP.
authorBrion Vibber <brion@users.mediawiki.org>
Wed, 22 Sep 2004 11:39:30 +0000 (11:39 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Wed, 22 Sep 2004 11:39:30 +0000 (11:39 +0000)
This avoids an E_NOTIFY-level warning and avoids having the empty
string set for the IP when running from CLI.

includes/Setup.php

index 51f70f9..7a9ed19 100644 (file)
@@ -40,8 +40,11 @@ if( $wgUseSquid && isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
                array_pop($hopips);
        }
        $wgIP = trim(end($hopips));
-} else {
+} elseif( isset( $_SERVER['REMOTE_ADDR'] ) ) {
        $wgIP = $_SERVER['REMOTE_ADDR'];
+} else {
+       # Running on CLI?
+       $wgIP = '127.0.0.1';
 }