| Index: trunk/extensions/UserMerge/UserMerge_body.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | } elseif ( in_array( $olduserID, $wgUserMergeUnmergeable ) || in_array( $olduser_text, $wgUserMergeUnmergeable ) ) { |
| 60 | 60 | $validOldUser = false; |
| 61 | 61 | $wgOut->addHTML( "<span style=\"color: red;\">" . wfMsg('usermerge-unmergable') . "</span><br>\n" ); |
| 62 | | - } elseif ( $objOldUser = $wgUser->getID() ) { |
| | 62 | + } elseif ( $olduserID == $wgUser->getID() ) { |
| 63 | 63 | $validOldUser = false; |
| 64 | 64 | $wgOut->addHTML( "<span style=\"color: red;\">" . wfMsg('usermerge-noselfdelete') . "</span><br>\n" ); |
| 65 | 65 | } else { |
| Index: trunk/extensions/UserMerge/UserMerge.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | 'author' => 'Tim Laqua', |
| 18 | 18 | 'description' => "Merges references from one user to another user in the Wiki database - will also delete old users following merge. Requires 'usermerge' privileges.", |
| 19 | 19 | 'descriptionmsg' => 'usermerge-desc', |
| 20 | | - 'version' => '1.4.1' |
| | 20 | + 'version' => '1.4.2' |
| 21 | 21 | ); |
| 22 | 22 | |
| 23 | 23 | $dir = dirname(__FILE__) . '/'; |