| Index: trunk/phase3/includes/SpecialBlockip.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | function showForm( $err ) { |
| 51 | | - global $wgOut, $wgUser, $wgLang, $wgBlockExpiryOptions; |
| | 51 | + global $wgOut, $wgUser, $wgLang; |
| 52 | 52 | global $wgRequest, $wgSysopUserBans; |
| 53 | 53 | |
| 54 | 54 | $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -668,11 +668,6 @@ |
| 669 | 669 | $wgSysopUserBans = true; # Allow sysops to ban logged-in users |
| 670 | 670 | $wgSysopRangeBans = true; # Allow sysops to ban IP ranges |
| 671 | 671 | |
| 672 | | -/** Comma-separated list of options to show on the IP block form. |
| 673 | | - * Use strtotime() format, or "infinite" for an infinite block |
| 674 | | - */ |
| 675 | | -$wgBlockExpiryOptions = "2 hours,1 day,3 days,1 week,2 weeks,1 month,3 months,6 months,1 year,infinite"; |
| 676 | | - |
| 677 | 672 | $wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire |
| 678 | 673 | |
| 679 | 674 | /** |