Merge branch 'archwiki'

Conflicts:
	extensions/ArchInterWiki.sql
	extensions/FluxBBAuthPlugin.php

1 files changed, 6 insertions, 1 deletions

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 3a9b5c56..e7a7849b 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -187,7 +187,12 @@ class ApiUpload extends ApiBase {
 		$chunkPath = $request->getFileTempname( 'chunk' );
 		$chunkSize = $request->getUpload( 'chunk' )->getSize();
 		if ($this->mParams['offset'] == 0) {
-			$result['filekey'] = $this->performStash();
+			try {
+				$result['filekey'] = $this->performStash();
+			} catch ( MWException $e ) {
+				// FIXME: Error handling here is wrong/different from rest of this
+				$this->dieUsage( $e->getMessage(), 'stashfailed' );
+			}
 		} else {
 			$status = $this->mUpload->addChunk($chunkPath, $chunkSize,
 										$this->mParams['offset']);