From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 3 Jul 2008 13:00:12 +0000 (+0000)
Subject: Bug 14088 - excessively long block expiry times no longer bork the logpage. Reject... 
X-Git-Tag: 1.31.0-rc.0~46780
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/Special:BookSources/2753300917?a=commitdiff_plain;h=56e142706aed7cd482b4b78babedb05ac6497b10;p=lhc%2Fweb%2Fwiklou.git

Bug 14088 - excessively long block expiry times no longer bork the logpage. Reject if over 50 chars.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bc60b96218..7186bf1f24 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -414,6 +414,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   on Special:Newpages.
 * (bug 12716) Trying to unprotect a title that isn't protected no longer 
   generates a log entry.
+* (bug 14088) Excessively long block expiry times are rejected as invalid,
+  keeps the log page from being distorted.
 
 === API changes in 1.13 ===
 
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 5ea25ca46a..52829d920d 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -339,7 +339,7 @@ class IPBlockForm {
 		if( $expirestr == 'other' )
 			$expirestr = $this->BlockOther;
 
-		if (strlen($expirestr) == 0) {
+		if ((strlen($expirestr) == 0) || (strlen($expirestr) > 50)) {
 			return array('ipb_expiry_invalid');
 		}