From bdf71f89ad239baf73589553ea317c018291244c Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Sat, 1 Nov 2014 20:24:13 +0000
Subject: [PATCH] Display error message when Media Library upload fails.

Props gcorne.
Fixes #29891.


git-svn-id: https://develop.svn.wordpress.org/trunk@30156 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/ms.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index c58fd20e50..66c9cb71f1 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -35,8 +35,9 @@ function check_upload_size( $file ) {
 	if ( upload_is_user_over_quota( false ) ) {
 		$file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
 	}
-	if ( $file['error'] != '0' && !isset($_POST['html-upload']) )
+	if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || DOING_AJAX != true ) ) {
 		wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
+	}
 
 	return $file;
 }