| Index: trunk/extensions/CheckUser/CheckUser.php |
| — | — | @@ -201,12 +201,13 @@ |
| 202 | 202 | */ |
| 203 | 203 | function efUpdateCUEmailData( $to, $from, $subject, $text ) { |
| 204 | 204 | global $wgSecretKey; |
| 205 | | - if( !$wgSecretKey ) { |
| | 205 | + if( !$wgSecretKey || $from->name == $to->name ) { |
| 206 | 206 | return true; |
| 207 | 207 | } |
| 208 | 208 | wfLoadExtensionMessages( 'CheckUser' ); |
| 209 | | - $user = User::newFromName( $to->name ); |
| 210 | | - $hash = md5( $user->getEmail() . $user->getId() . $wgSecretKey ); |
| | 209 | + $userFrom = User::newFromName( $from->name ); |
| | 210 | + $userTo = User::newFromName( $to->name ); |
| | 211 | + $hash = md5( $userTo->getEmail() . $userTo->getId() . $wgSecretKey ); |
| 211 | 212 | // Get IP |
| 212 | 213 | $ip = wfGetIP(); |
| 213 | 214 | // Get XFF header |
| — | — | @@ -224,8 +225,8 @@ |
| 225 | 226 | 'cuc_namespace' => NS_USER, |
| 226 | 227 | 'cuc_title' => '', |
| 227 | 228 | 'cuc_minor' => 0, |
| 228 | | - 'cuc_user' => $user->getId(), |
| 229 | | - 'cuc_user_text' => $user->getName(), |
| | 229 | + 'cuc_user' => $userFrom->getId(), |
| | 230 | + 'cuc_user_text' => $userFrom->getName(), |
| 230 | 231 | 'cuc_actiontext' => wfMsgForContent('checkuser-email-action',$hash), |
| 231 | 232 | 'cuc_comment' => '', |
| 232 | 233 | 'cuc_this_oldid' => 0, |