http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100658
Revision: 100658
Author: aaron
Date: 2011-10-24 22:38:20 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Fix r100657, just use wfGetIP()...sigh
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/User.php
Modified: branches/wmf/1.18wmf1/includes/User.php
===================================================================
--- branches/wmf/1.18wmf1/includes/User.php 2011-10-24 22:33:17 UTC (rev
100657)
+++ branches/wmf/1.18wmf1/includes/User.php 2011-10-24 22:38:20 UTC (rev
100658)
@@ -2920,7 +2920,6 @@
* @return bool A block was spread
*/
protected function spreadBlock() {
- global $wgRequest;
wfDebug( __METHOD__ . "()\n" );
$this->load();
if ( $this->mId == 0 ) {
@@ -2932,7 +2931,7 @@
return false;
}
- return (bool)$userblock->doAutoblock( $wgRequest->getIP() );
+ return (bool)$userblock->doAutoblock( wfGetIP() );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
