* Removed $wgBlockExpiryOptions, obsoleted by msg:ipboptions

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6d15998..689a22e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -668,11 +668,6 @@ $wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'mino
 $wgSysopUserBans        = true; # Allow sysops to ban logged-in users
 $wgSysopRangeBans              = true; # Allow sysops to ban IP ranges
 
-/** Comma-separated list of options to show on the IP block form. 
-  * Use strtotime() format, or "infinite" for an infinite block 
-  */
-$wgBlockExpiryOptions = "2 hours,1 day,3 days,1 week,2 weeks,1 month,3 months,6 months,1 year,infinite";
-
 $wgAutoblockExpiry             = 86400; # Number of seconds before autoblock entries expire
 
 /**

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index ca1b398..2545be1 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -47,7 +47,7 @@ class IPBlockForm {
        }
        
        function showForm( $err ) {
-               global $wgOut, $wgUser, $wgLang, $wgBlockExpiryOptions;
+               global $wgOut, $wgUser, $wgLang;
                global $wgRequest, $wgSysopUserBans;
 
                $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );