From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 24 Jun 2007 22:34:30 +0000 (+0000)
Subject: (bug 9250) Remove hardcoded minimum image name length of three characters.  Message... 
X-Git-Tag: 1.31.0-rc.0~52419
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/load.php?a=commitdiff_plain;h=5444687ac5b3aa3654941aa28ad5b661b896c9f3;p=lhc%2Fweb%2Fwiklou.git

(bug 9250) Remove hardcoded minimum image name length of three characters.  Message minlength renamed to minlength1.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 92c2f9bf46..f3493d930e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -100,6 +100,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10326) AJAX-based page watching and unwatching has been cleaned up and
   enabled by default.
 * Added option to install to MyISAM
+* (bug 9250) Remove hardcoded minimum image name length of three characters
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 112e4ec042..ff8091b615 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -308,8 +308,8 @@ class UploadForm {
 				$partname .= '.' . $ext[$i];
 		}
 
-		if( strlen( $partname ) < 3 ) {
-			$this->mainUploadForm( wfMsgHtml( 'minlength' ) );
+		if( strlen( $partname ) < 1 ) {
+			$this->mainUploadForm( wfMsgHtml( 'minlength1' ) );
 			return;
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7f21d1b012..bd3d886063 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1361,7 +1361,7 @@ To include the image in a page, use a link in the form
 'uploadedfiles'               => 'Uploaded files',
 'ignorewarning'               => 'Ignore warning and save file anyway.',
 'ignorewarnings'              => 'Ignore any warnings',
-'minlength'                   => 'File names must be at least three letters.',
+'minlength1'                  => 'File names must be at least one letter.',
 'illegalfilename'             => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.',
 'badfilename'                 => 'File name has been changed to "$1".',
 'filetype-badmime'            => 'Files of the MIME type "$1" are not allowed to be uploaded.',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 07153e8fe7..288d90aa72 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -1025,7 +1025,7 @@ $messages = array(
 'uploadedfiles'               => 'קבצים שהועלו',
 'ignorewarning'               => 'התעלם מהאזהרה ושמור את הקובץ בכל זאת.',
 'ignorewarnings'              => 'התעלם מכל האזהרות',
-'minlength'                   => 'שמות של קבצי תמונה צריכים להיות בני שלושה תווים לפחות.',
+'minlength1'                  => 'שמות של קבצי תמונה צריכים להיות בני תו אחד לפחות.',
 'illegalfilename'             => 'הקובץ "$1" מכיל תוים בלתי חוקיים. אנא שנו את שמו ונסו להעלותו שנית.',
 'badfilename'                 => 'שם התמונה שונה ל־"$1".',
 'filetype-badmime'            => 'לא ניתן להעלות קבצים עם סוג ה־MIME "$1".',