(bug 13269) Adding MediaWiki:Uploadfooter to the bottom of Special:Upload

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1cd4933..c7598e9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -39,6 +39,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add --old-redirects-only option to maintenance/refreshLinks.php, to add old
   redirects to the redirect table
 * Add links to page and file deletion forms to edit predefined delete reasons 
+* (bug 13269) Added MediaWiki:Uploadfooter to the bottom of Special:Upload
 
 === Bug fixes in 1.13 ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 8f3a37a..1e3f57c 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -1027,7 +1027,7 @@ wgAjaxLicensePreview = {$alp};
                if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) {
                        $filename_form =
                                "<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " .
-                                  "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked />" .
+                                  "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked='checked' />" .
                                 "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
                                   "onfocus='" . 
                                     "toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
@@ -1040,7 +1040,7 @@ wgAjaxLicensePreview = {$alp};
                                  "onfocus='" .
                                    "toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" .
                                    "toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" .
-                               ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='60' DISABLED />" .
+                               ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='60' disabled='disabled' />" .
                                wfMsgHtml( 'upload_source_url' ) ;
                } else {
                        $filename_form =
@@ -1158,6 +1158,10 @@ EOT
        </table>
        <input type='hidden' name='wpDestFileWarningAck' id='wpDestFileWarningAck' value=''/>
        </form>" );
+               $uploadfooter = wfMsgNoTrans( 'uploadfooter' );
+               if( $uploadfooter != '-' && !wfEmptyMsg( 'uploadfooter', $uploadfooter ) ){
+                       $wgOut->addWikiText( $uploadfooter );
+               }
        }
 
        /* -------------------------------------------------------------- */

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e15c82c..3da983c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1406,6 +1406,7 @@ To include a file in a page, use a link in the form
 'upload-permitted'            => 'Permitted file types: $1.',
 'upload-preferred'            => 'Preferred file types: $1.',
 'upload-prohibited'           => 'Prohibited file types: $1.',
+'uploadfooter'                => '-', # don't translate or duplicate this message to other languages
 'uploadlog'                   => 'upload log',
 'uploadlogpage'               => 'Upload log',
 'uploadlogpagetext'           => 'Below is a list of the most recent file uploads.',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index fd22996..7354eb3 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -108,6 +108,7 @@ $wgIgnoredMessages = array(
        'talkpagetext',
        'trackback',
        'trackbackexcerpt',
+       'uploadfooter',
 );
 
 /** Optional messages, which may be translated only if changed in the other language. */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index ff49f29..421d5e2 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -840,6 +840,7 @@ $wgMessageStructure = array(
                'upload-permitted',
                'upload-preferred',
                'upload-prohibited',
+               'uploadfooter',
                'uploadlog',
                'uploadlogpage',
                'uploadlogpagetext',
@@ -2242,6 +2243,7 @@ $wgMessageStructure = array(
                'catseparator',
                'semicolon-separator',
                'comma-separator',
+               'colon-separator',
        ),
        'imgmulti' => array(
                'imgmultipageprev',