{"shas":[["3993115a9c956a8ae95eef7f792f5eb7fe1a0c08","428a3cf95b764cbfdde220aa9306c1079ce7bed4@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","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.\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@84584 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","happy-melon"],["0e6cfa1912868471b0a119a5440955c846fcced5","428a3cf95b764cbfdde220aa9306c1079ce7bed4@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Fix r84584.\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@84587 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","happy-melon"],["2240e03b82f1908471f3442f5f0ec6850b3fe017","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-04-04 12:51:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@85328 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["130cb8bd2b6b9043f0e8aacb6c77f56c01932aab","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-04-11 18:35:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@85817 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["75f36440badc457a87fa9c47ed53edb86f92a86b","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-04-23 21:50:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@86803 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["2982f52848c510fb9af6d0106de6a5361d873447","2a5f24b7c7fae58abdd23061a1bd17b581766b4d@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Xml::hidden() --> Html::hidden()\n\nXml::hidden() killed\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@87595 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","reedy"],["821cf3e082cc96a580f2c5b87af6911c371597a3","dc548a8c362cf86d290c663311b10dac086658ee@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for special page aliases for extensions from http://translatewiki.net.\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@88028 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","siebrand"],["3568f1a2e701eaec6175e98f81cd96a6ead37126","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","added 2 hooks DeleteAccount, MergeAccountFromTo; changed function call parameters (added objects)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@89010 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["7f6693db5139e5a3f4f0109c97da8fa9f5056179","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","bugfix for case: olduser does not exist\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@89011 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["131f362c9c4e6790f9f72ec032fc4cb29676922b","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","implemented the long-felt need of having also the watchlist merged; +code cosmetic\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@89015 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["5ec338992d95a611f04c80fc8e6a262d59a4048b","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","hook parameters pass by reference\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@89147 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["6d18780c5838597a64c60881c665fddc1b9806f0","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","array( author1, author2 )\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@89151 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["924c3ddb45471b0bc3c766835649ed1011b6fff5","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","new version 1.6.3; adds edit count of fromUser to toUser; move; redirects user page of fromUser to toUser, if this does not exist or is empty; deletes fromUser page if toUser page exists; code contributed by Matthew April. small changes and checked by committer\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90650 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["8bbbbea164091545a01e5599058e86a449d5337f","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-06-23 20:15:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90675 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["c79f4b693b315bfa98df5c764ef77b5c36ed3c89","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","follow up patch to r90650 ; making most of it conforming to mw coding conventions\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90684 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["d85ab8075c15486d0faffe793ac477de84dc1c31","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-06-24 20:31:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90736 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["6a716876518f7fec20ba731833fe4e4558f62c23","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for ToolserverI18N messages from translatewiki.net (2011-06-26 19:34:00)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90852 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["f8c4d4be42a32036928d7a3bfa00060dc2415edc","32261e7cbe91a5c29dfbca165b3787d577161aa0@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","correction of the copyright message, which was incorrectly introduced in r90650\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@90854 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","wikinaut"],["cdb86a508e96a9b107ee24371464e7faa23a3408","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","git-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@91107 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"],["0a6b7c396604ee5dfe5a7654f5f1d1470f7e38e5","c9904d5ab9931e0f29f721aa0754effc77b66196@dd0e9695-b195-4be7-bd10-2dea1a65a6b6","Localisation updates for core and extension messages from translatewiki.net (2011-07-06 19:40:00 UTC)\n\ngit-svn-id: http://svn.wikimedia.org/svnroot/mediawiki/trunk@91592 dd0e9695-b195-4be7-bd10-2dea1a65a6b6","raymond"]],"ref":"refs/heads/UserMerge","size":20,"head":"0a6b7c396604ee5dfe5a7654f5f1d1470f7e38e5","push_id":36147652}