(bug 29325) Setting $wgStrictFileExtensions to false gives incorrect warning

[lhc/web/wiklou.git] / includes / upload / UploadBase.php

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 58c0472..3350ab6 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -509,6 +509,8 @@ abstract class UploadBase {
         * @return Array of warnings
         */
        public function checkWarnings() {
+               global $wgLang;
+
                $warnings = array();
 
                $localFile = $this->getLocalFile();
@@ -529,7 +531,8 @@ abstract class UploadBase {
                global $wgCheckFileExtensions, $wgFileExtensions;
                if ( $wgCheckFileExtensions ) {
                        if ( !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) {
-                               $warnings['filetype-unwanted-type'] = $this->mFinalExtension;
+                               $warnings['filetype-unwanted-type'] = array( $this->mFinalExtension,
+                                       $wgLang->commaList( $wgFileExtensions ) );
                        }
                }