Added post-commit callback support to DB classes.

[lhc/web/wiklou.git] / includes / api / ApiUpload.php

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index b3ec54b..3a9b5c5 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -428,11 +428,21 @@ class ApiUpload extends ApiBase {
                                break;
 
                        case UploadBase::FILETYPE_BADTYPE:
-                               $this->dieUsage( 'This type of file is banned', 'filetype-banned',
-                                               0, array(
-                                                       'filetype' => $verification['finalExt'],
-                                                       'allowed' => $wgFileExtensions
-                                               ) );
+                               $extradata = array(
+                                       'filetype' => $verification['finalExt'],
+                                       'allowed' => $wgFileExtensions
+                               );
+                               $this->getResult()->setIndexedTagName( $extradata['allowed'], 'ext' );
+
+                               $msg = "Filetype not permitted: ";
+                               if ( isset( $verification['blacklistedExt'] ) ) {
+                                       $msg .= join( ', ', $verification['blacklistedExt'] );
+                                       $extradata['blacklisted'] = array_values( $verification['blacklistedExt'] );
+                                       $this->getResult()->setIndexedTagName( $extradata['blacklisted'], 'ext' );
+                               } else {
+                                       $msg .= $verification['finalExt'];
+                               }
+                               $this->dieUsage( $msg, 'filetype-banned', 0, $extradata );
                                break;
                        case UploadBase::VERIFICATION_ERROR:
                                $this->getResult()->setIndexedTagName( $verification['details'], 'detail' );
@@ -459,8 +469,6 @@ class ApiUpload extends ApiBase {
         * @return array
         */
        protected function getApiWarnings() {
-               $warnings = array();
-
                $warnings = $this->mUpload->checkWarnings();
 
                return $this->transformWarnings( $warnings );