| Index: trunk/extensions/CheckUser/CheckUser.i18n.php |
| — | — | @@ -66,7 +66,6 @@ |
| 67 | 67 | 'checkuser-log-ipusers-xff' => '$1 got users for XFF $2', |
| 68 | 68 | |
| 69 | 69 | 'checkuser-email-action' => 'sent an email to "$1"', |
| 70 | | - 'checkuser-email-action2' => 'sent an email to "$1" (sender at "$2")', |
| 71 | 70 | |
| 72 | 71 | 'checkuser-toollinks' => '<span class="plainlinks">[[http://openrbl.org/query?$1 RDNS] · |
| 73 | 72 | [http://www.robtex.com/rbls/$1.html RBLs] · |
| Index: trunk/extensions/CheckUser/CheckUser.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | # Recent changes data hook |
| 37 | 37 | global $wgHooks; |
| 38 | 38 | $wgHooks['RecentChange_save'][] = 'efUpdateCheckUserData'; |
| 39 | | -//$wgHooks['EmailUser'][] = 'efUpdateCheckUserEmailData'; // do not use at present |
| | 39 | +$wgHooks['EmailUser'][] = 'efUpdateCheckUserEmailData'; |
| 40 | 40 | |
| 41 | 41 | $wgHooks['ParserTestTables'][] = 'efCheckUserParserTestTables'; |
| 42 | 42 | $wgHooks['LoadExtensionSchemaUpdates'][] = 'efCheckUserSchemaUpdates'; |
| — | — | @@ -115,7 +115,6 @@ |
| 116 | 116 | * Saves user data into the cu_changes table |
| 117 | 117 | */ |
| 118 | 118 | function efUpdateCheckUserEmailData( $to, $from, $subject, $text ) { |
| 119 | | - die("Do not use at present."); |
| 120 | 119 | wfLoadExtensionMessages( 'CheckUser' ); |
| 121 | 120 | $user = User::newFromName( $to->name ); |
| 122 | 121 | $userPage = $user->getUserPage(); |
| — | — | @@ -138,10 +137,8 @@ |
| 139 | 138 | 'cuc_minor' => 0, |
| 140 | 139 | 'cuc_user' => $user->getId(), |
| 141 | 140 | 'cuc_user_text' => $user->getName(), |
| 142 | | - 'cuc_actiontext' => $from->address ? |
| 143 | | - wfMsgForContent('checkuser-email-action2',$to->name,$from->address) : |
| 144 | | - wfMsgForContent('checkuser-email-action',$to->name), |
| 145 | | - 'cuc_comment' => $subject, |
| | 141 | + 'cuc_actiontext' => wfMsgForContent('checkuser-email-action',$to->name), |
| | 142 | + 'cuc_comment' => '', |
| 146 | 143 | 'cuc_this_oldid' => 0, |
| 147 | 144 | 'cuc_last_oldid' => 0, |
| 148 | 145 | 'cuc_type' => RC_LOG, |