mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00
Code Issues Releases Wiki Activity

[ticket/13771] Allow AJAX errors to support exceptions messages

Browse Source 
PHPBB3-13771
This commit is contained in:
Matt Friedman 2015-04-21 00:19:41 -07:00
parent c46024bfa2
commit 4a7f905c6a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/assets/javascript/core.js
View File

@ -263,7 +263,11 @@ phpbb.ajaxify = function(options) {
} }
phpbb.clearLoadingTimeout(); phpbb.clearLoadingTimeout();
var errorText = false; 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; errorText = errorThrown;
} }
else { else {