http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100657
Revision: 100657
Author: aaron
Date: 2011-10-24 22:33:17 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Fixed merge mismatches in r100655
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/User.php
branches/wmf/1.18wmf1/includes/specials/SpecialMovepage.php
Modified: branches/wmf/1.18wmf1/includes/User.php
===================================================================
--- branches/wmf/1.18wmf1/includes/User.php 2011-10-24 22:28:09 UTC (rev
100656)
+++ branches/wmf/1.18wmf1/includes/User.php 2011-10-24 22:33:17 UTC (rev
100657)
@@ -2920,6 +2920,7 @@
* @return bool A block was spread
*/
protected function spreadBlock() {
+ global $wgRequest;
wfDebug( __METHOD__ . "()\n" );
$this->load();
if ( $this->mId == 0 ) {
@@ -2931,7 +2932,7 @@
return false;
}
- return (bool)$userblock->doAutoblock(
$this->getRequest()->getIP() );
+ return (bool)$userblock->doAutoblock( $wgRequest->getIP() );
}
/**
Modified: branches/wmf/1.18wmf1/includes/specials/SpecialMovepage.php
===================================================================
--- branches/wmf/1.18wmf1/includes/specials/SpecialMovepage.php 2011-10-24
22:28:09 UTC (rev 100656)
+++ branches/wmf/1.18wmf1/includes/specials/SpecialMovepage.php 2011-10-24
22:33:17 UTC (rev 100657)
@@ -75,7 +75,7 @@
$permErrors = $this->oldTitle->getUserPermissionsErrors(
'move', $wgUser );
if( !empty( $permErrors ) ) {
// Auto-block user's IP if the account was "hard"
blocked
- $user->spreadAnyEditBlock();
+ $wgUser->spreadAnyEditBlock();
$this->getOutput()->showPermissionsErrorPage(
$permErrors );
return;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
