diff options
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 |
1 files changed, 5 insertions, 1 deletions
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 { |