* added missing setIndexedTagName for some upload api array results

* switched apiFormatJson output from 'application/json' to 'text/javascript'

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index cf1f16c..1d7e3dc 100644 (file)
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -41,7 +41,7 @@ class ApiFormatJson extends ApiFormatBase {
        }
 
        public function getMimeType() {
-               return 'application/json';
+               return 'text/javascript';
        }
 
        public function getNeedsRawData() {

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 62ff21a..57f3541 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -237,7 +237,13 @@ class ApiUpload extends ApiBase {
                        $warnings = $this->mUpload->checkWarnings();
                        if( $warnings ) {
                                $this->getResult()->setIndexedTagName( $warnings, 'warning' );
-
+                               //also add index to duplicate: 
+                               if(isset($warnings['duplicate']))
+                                       $this->getResult()->setIndexedTagName( $warnings['duplicate'], 'duplicate');
+                               
+                               if(isset($warnings['exists']))
+                                       $this->getResult()->setIndexedTagName( $warnings['exists'], 'exists');
+                                       
                                $result['result'] = 'Warning';
                                $result['warnings'] = $warnings;
                                if( isset( $result['filewasdeleted'] ) )