| Index: trunk/phase3/skins/common/block.js |
| — | — | @@ -22,26 +22,32 @@ |
| 23 | 23 | function updateBlockOptions() { |
| 24 | 24 | if (!document.getElementById) |
| 25 | 25 | return; |
| 26 | | - |
| | 26 | + |
| 27 | 27 | var target = document.getElementById('mw-bi-target'); |
| 28 | 28 | if (!target) |
| 29 | 29 | return; |
| 30 | | - |
| | 30 | + |
| 31 | 31 | var addy = target.value; |
| 32 | 32 | var isEmpty = addy.match(/^\s*$/); |
| 33 | 33 | var isIp = addy.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7})(\/\d+)?$/); |
| 34 | | - |
| | 34 | + |
| 35 | 35 | /* |
| 36 | 36 | var anonymousCheck = document.getElementById('wpAnonOnly'); |
| 37 | 37 | anonymousCheck.disabled = !isIp && !isEmpty; |
| 38 | | - |
| | 38 | + |
| 39 | 39 | var autoblockCheck = document.getElementById('wpEnableAutoblock'); |
| 40 | 40 | autoblockCheck.disabled = isIp && !isEmpty; |
| | 41 | + |
| | 42 | + var emailblockCheck = document.getElementById('wpEmailBan'); |
| | 43 | + emailblockCheck.disabled = isIp && !isEmpty; |
| 41 | 44 | */ |
| 42 | 45 | |
| 43 | 46 | var anonymousRow = document.getElementById('wpAnonOnlyRow'); |
| 44 | 47 | anonymousRow.style.display = (!isIp && !isEmpty) ? 'none' : ''; |
| 45 | | - |
| | 48 | + |
| 46 | 49 | var autoblockRow = document.getElementById('wpEnableAutoblockRow'); |
| 47 | 50 | autoblockRow.style.display = isIp && !isEmpty ? 'none' : ''; |
| | 51 | + |
| | 52 | + var emailblockRow = document.getElementById('wpEnableEmailBan'); |
| | 53 | + emailblockRow.style.display = isIp && !isEmpty ? 'none' : ''; |
| 48 | 54 | } |
| Index: trunk/phase3/includes/SpecialBlockip.php |
| — | — | @@ -245,7 +245,7 @@ |
| 246 | 246 | |
| 247 | 247 | if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) { |
| 248 | 248 | $wgOut->addHTML(" |
| 249 | | - <tr> |
| | 249 | + <tr id='wpEnableEmailBan'> |
| 250 | 250 | <td> </td> |
| 251 | 251 | <td> |
| 252 | 252 | " . wfCheckLabel( wfMsgHtml( 'ipbemailban' ), |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1182,7 +1182,7 @@ |
| 1183 | 1183 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1184 | 1184 | * styles. |
| 1185 | 1185 | */ |
| 1186 | | -$wgStyleVersion = '75'; |
| | 1186 | +$wgStyleVersion = '76'; |
| 1187 | 1187 | |
| 1188 | 1188 | |
| 1189 | 1189 | # Server-side caching: |