From 4a7f905c6aaa93b4c7160e9c99fced3001189037 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 21 Apr 2015 00:19:41 -0700
Subject: [PATCH] [ticket/13771] Allow AJAX errors to support exceptions
 messages

PHPBB3-13771
---
 phpBB/assets/javascript/core.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 806db7d35f..33f4021cb9 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -263,7 +263,11 @@ phpbb.ajaxify = function(options) {
 			}
 			phpbb.clearLoadingTimeout();
 			var errorText = false;
-			if (typeof errorThrown === 'string' && errorThrown.length > 0) {
+			var responseText = $.parseJSON(jqXHR.responseText);
+			if (typeof responseText.message === 'string' && responseText.message.length > 0) {
+				errorText = responseText.message;
+			}
+			else if (typeof errorThrown === 'string' && errorThrown.length > 0) {
 				errorText = errorThrown;
 			}
 			else {