login/logout link
* Fix for parser tests with MySQL 5 in strict mode
* Added block option "enable autoblocks"
-
+* Amend Special:Ipblocklist to note when a block has autoblock DISABLED.
== Languages updated ==
if( is_null( $msg ) ) {
$msg = array();
$keys = array( 'infiniteblock', 'expiringblock', 'contribslink', 'unblocklink',
- 'anononlyblock', 'createaccountblock' );
+ 'anononlyblock', 'createaccountblock', 'noautoblockblock' );
foreach( $keys as $key ) {
$msg[$key] = wfMsgHtml( $key );
}
if ( $block->mCreateAccount ) {
$properties[] = $msg['createaccountblock'];
}
+ if (!$block->mEnableAutoblock ) {
+ $properties[] = $msg['noautoblockblock'];
+ }
+
$properties = implode( ', ', $properties );
$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) );
'infiniteblock' => 'infinite',
'expiringblock' => 'expires $1',
'anononlyblock' => 'anon. only',
+'noautoblockblock' => 'autoblock disabled',
'createaccountblock' => 'account creation blocked',
'ipblocklistempty' => 'The blocklist is empty.',
'blocklink' => 'block',