From 3b8024312c89cb6df14b157e863b51f559b3853a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 28 Jun 2005 17:00:34 +0000 Subject: [PATCH] * Removed $wgBlockExpiryOptions, obsoleted by msg:ipboptions --- includes/DefaultSettings.php | 5 ----- includes/SpecialBlockip.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6d159984a5..689a22ea16 100644 --- 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 ca1b398d3d..2545be154a 100644 --- 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' ) ) ); -- 2.20.1