http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84584
Revision: 84584
Author: happy-melon
Date: 2011-03-22 23:22:18 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Fix for UserMerge revealed by Block rewrite. Basically UserMerge was updating
the ipb_address field with the new name of the user, but not ipb_user with the
new id; it was also not updating ipb_by and ipb_by_name. This was not
previously a problem because the Block constructor looked at the row via the
ipb_user field first and would never decide that the block was applicable; the
new system looks at ipb_address first and associates the block with the new
user. This fix is just to make sure that the other fields are correctly
updated when a merge is performed; the user being merged into still acquires
any blocks on the user being merged.
Modified Paths:
--------------
trunk/extensions/UserMerge/UserMerge_body.php
Modified: trunk/extensions/UserMerge/UserMerge_body.php
===================================================================
--- trunk/extensions/UserMerge/UserMerge_body.php 2011-03-22 23:16:39 UTC
(rev 84583)
+++ trunk/extensions/UserMerge/UserMerge_body.php 2011-03-22 23:22:18 UTC
(rev 84584)
@@ -213,7 +213,8 @@
array('image','img_user_text'),
array('oldimage','oi_user_text'),
array('recentchanges','rc_user_text'),
- array('ipblocks','ipb_address')
+ array('ipblocks','ipb_address'),
+ array('ipblocks','ipb_by_name'),
);
$idUpdateFields = array(
@@ -223,7 +224,9 @@
array('image','img_user'),
array('oldimage','oi_user'),
array('recentchanges','rc_user'),
- array('logging','log_user')
+ array('logging','log_user'),
+ array('ipblocks', 'ipb_id'),
+ array('ipblocks', 'ipb_by'),
);
$dbw = wfGetDB( DB_MASTER );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
