From: Michael Dale <dale@users.mediawiki.org>
Date: Sat, 15 Aug 2009 10:22:20 +0000 (+0000)
Subject: * added missing setIndexedTagName for some upload api array results
X-Git-Tag: 1.31.0-rc.0~40295
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=305179ffa3d141973d5ddb31261d8e1730c18684;p=lhc%2Fweb%2Fwiklou.git

* 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 cf1f16cebd..1d7e3dccd3 100644
--- 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 62ff21aa72..57f3541f4d 100644
--- 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'] ) )