| Index: trunk/extensions/Newuserlog/Newuserlog.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | $wgLogTypes[] = 'newusers'; |
| 29 | 29 | $wgLogNames['newusers'] = 'newuserlogpage'; |
| 30 | 30 | $wgLogHeaders['newusers'] = 'newuserlogpagetext'; |
| 31 | | -$wgLogActions['newusers/newusers'] = 'newuserlogentry'; |
| | 31 | +$wgLogActions['newusers/newusers'] = 'newuserlogentry'; // For compatibility with older log entries |
| 32 | 32 | $wgLogActions['newusers/create'] = 'newuserlog-create-entry'; |
| 33 | 33 | $wgLogActions['newusers/create2'] = 'newuserlog-create2-entry'; |
| 34 | 34 | $wgLogActions['newusers/autocreate'] = 'newuserlog-autocreate-entry'; |
| — | — | @@ -58,22 +58,12 @@ |
| 59 | 59 | } else { |
| 60 | 60 | // Links not necessary for self-creations, they will appear already in |
| 61 | 61 | // recentchanges and special:log view for the creating user. |
| 62 | | - // For compatability: From 1.10alpha the 'user tools' are used at special:log |
| 63 | | - // see bug 4756: Long usernames break block link in new user log entries |
| 64 | 62 | |
| 65 | 63 | wfLoadExtensionMessages( 'Newuserlog' ); |
| 66 | 64 | $contribs = wfMsgForContent( 'contribslink' ); |
| 67 | 65 | $block = wfMsgForContent( 'blocklink' ); |
| 68 | 66 | $action = 'create2'; |
| 69 | | - $message = ''; |
| 70 | | - if ( version_compare( $wgVersion, '1.10alpha', '>=' ) ) { |
| 71 | | - if( $byEmail ) { |
| 72 | | - $message = wfMsgForContent( 'newuserlog-byemail' ); |
| 73 | | - } |
| 74 | | - } else { |
| 75 | | - $message = wfMsgForContent( 'newuserlog-create-text', |
| 76 | | - $user->getName(), $talk, $contribs, $block ); |
| 77 | | - } |
| | 67 | + $message = $byEmail ? wfMsgForContent( 'newuserlog-byemail' ) : ''; |
| 78 | 68 | } |
| 79 | 69 | |
| 80 | 70 | $log = new LogPage( 'newusers' ); |
| Index: trunk/extensions/Newuserlog/Newuserlog.i18n.php |
| — | — | @@ -8,15 +8,14 @@ |
| 9 | 9 | $messages = array(); |
| 10 | 10 | |
| 11 | 11 | $messages['en'] = array( |
| 12 | | - 'newuserlogpage' => 'User creation log', |
| 13 | | - 'newuserlogpagetext' => 'This is a log of user creations', |
| 14 | | - 'newuserlog-desc' => 'Adds a [[Special:Log/newusers|log of account creations]] to [[Special:Log]]', |
| 15 | | - 'newuserlogentry' => '', # For compatibility, do not translate this |
| 16 | | - 'newuserlog-byemail' => 'password sent by e-mail', |
| 17 | | - 'newuserlog-create-entry' => 'New user', |
| 18 | | - 'newuserlog-create2-entry' => 'created account for $1', |
| | 12 | + 'newuserlogpage' => 'User creation log', |
| | 13 | + 'newuserlogpagetext' => 'This is a log of user creations', |
| | 14 | + 'newuserlog-desc' => 'Adds a [[Special:Log/newusers|log of account creations]] to [[Special:Log]]', |
| | 15 | + 'newuserlogentry' => '', # For compatibility, do not translate this |
| | 16 | + 'newuserlog-byemail' => 'password sent by e-mail', |
| | 17 | + 'newuserlog-create-entry' => 'New user', |
| | 18 | + 'newuserlog-create2-entry' => 'created account for $1', |
| 19 | 19 | 'newuserlog-autocreate-entry' => 'Account created automatically', |
| 20 | | - 'newuserlog-create-text' => "[[User talk:$1|$2]] | [[Special:Contributions/$1|$3]] | [[Special:Blockip/$1|$4]]", # For compatibility <= MW 1.9, do not translate this |
| 21 | 20 | ); |
| 22 | 21 | |
| 23 | 22 | $messages['af'] = array( |
| Index: trunk/extensions/Translate/MessageGroups.php |
| — | — | @@ -1840,7 +1840,6 @@ |
| 1841 | 1841 | |
| 1842 | 1842 | protected $ignored = array( |
| 1843 | 1843 | 'newuserlogentry', |
| 1844 | | - 'newuserlog-create-text', |
| 1845 | 1844 | ); |
| 1846 | 1845 | } |
| 1847 | 1846 | |