Bug 14088 - excessively long block expiry times no longer bork the logpage. Reject...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bc60b96..7186bf1 100644 (file)
--- 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 5ea25ca..52829d9 100644 (file)
--- 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');
                }