Fix for r51774, r51784: set '127.0.0.1' as IP for CLI, but with explicit check for...

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index fe31376..bb5c85a 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -67,7 +67,7 @@ function wfGetAgent() {
  * @return string
  */
 function wfGetIP() {
-       global $wgIP, $wgUsePrivateIPs;
+       global $wgIP, $wgUsePrivateIPs, $wgCommandLineMode;
 
        # Return cached result
        if ( !empty( $wgIP ) ) {
@@ -81,6 +81,8 @@ function wfGetIP() {
        # Client connecting to this webserver
        if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
                $ip = IP::canonicalize( $_SERVER['REMOTE_ADDR'] );
+       } elseif( $wgCommandLineMode ) {
+               $ip = '127.0.0.1';
        }
        if( $ip ) {
                $ipchain[] = $ip;