| Index: trunk/extensions/UserMerge/UserMerge_body.php |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | $log = new LogPage( 'usermerge' ); |
| 185 | 185 | $log->addEntry( 'deleteuser', $wgUser->getUserPage(), '', array( $olduser_text, $olduserID ) ); |
| 186 | 186 | |
| 187 | | - wfRunHooks( 'DeleteAccount', array( $objOldUser ) ); |
| | 187 | + wfRunHooks( 'DeleteAccount', array( &$objOldUser ) ); |
| 188 | 188 | |
| 189 | 189 | $users = $dbw->selectField( 'user', 'COUNT(*)', array() ); |
| 190 | 190 | $admins = $dbw->selectField( 'user_groups', 'COUNT(*)', array( 'ug_group' => 'sysop' ) ); |
| — | — | @@ -251,7 +251,7 @@ |
| 252 | 252 | $log = new LogPage( 'usermerge' ); |
| 253 | 253 | $log->addEntry( 'mergeuser', $wgUser->getUserPage(), '', array( $olduser_text, $olduserID, $newuser_text, $newuserID ) ); |
| 254 | 254 | |
| 255 | | - wfRunHooks( 'MergeAccountFromTo', array( $objOldUser, $objNewUser ) ); |
| | 255 | + wfRunHooks( 'MergeAccountFromTo', array( &$objOldUser, &$objNewUser ) ); |
| 256 | 256 | |
| 257 | 257 | return true; |
| 258 | 258 | } |
| Index: trunk/extensions/UserMerge/UserMerge.php |
| — | — | @@ -13,9 +13,9 @@ |
| 14 | 14 | 'path' => __FILE__, |
| 15 | 15 | 'name' => 'User Merge and Delete', |
| 16 | 16 | 'url' => 'http://www.mediawiki.org/wiki/Extension:User_Merge_and_Delete', |
| 17 | | - 'author' => 'Tim Laqua', |
| | 17 | + 'author' => 'Tim Laqua, Thomas Gries', |
| 18 | 18 | 'descriptionmsg' => 'usermerge-desc', |
| 19 | | - 'version' => '1.6.2' |
| | 19 | + 'version' => '1.6.21' |
| 20 | 20 | ); |
| 21 | 21 | |
| 22 | 22 | $wgAvailableRights[] = 'usermerge'; |
