From 38036c72b9a04cc67a04045f14c232974a76d7fc Mon Sep 17 00:00:00 2001
From: Ron Rennick <wpmuguru@git.wordpress.org>
Date: Tue, 18 May 2010 01:25:13 +0000
Subject: [PATCH] only die on async upload error, see #12853

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

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index f5f6e5a3d4..f5c2e62a0b 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -36,7 +36,7 @@ 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' )
+	if ( $file['error'] != '0' && isset($_POST['html-upload']) )
 		wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
 
 	return $file;