diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-30 11:33:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-30 11:33:50 +0200 |
| commit | b499a1ce0654c56465843f39eef892e306dd6c55 (patch) | |
| tree | 1917e5a0416940d4fed0c0614346b8ed7bc99641 /phpBB | |
| parent | f958d05aedddae9704b01ff5fc06112e57ff3efd (diff) | |
| parent | df4b391baadd3b9194062a4907ef4b55b265ffab (diff) | |
| download | forums-b499a1ce0654c56465843f39eef892e306dd6c55.tar forums-b499a1ce0654c56465843f39eef892e306dd6c55.tar.gz forums-b499a1ce0654c56465843f39eef892e306dd6c55.tar.bz2 forums-b499a1ce0654c56465843f39eef892e306dd6c55.tar.xz forums-b499a1ce0654c56465843f39eef892e306dd6c55.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 9eb931270a..9182d70473 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -262,8 +262,15 @@ phpbb.ajaxify = function(options) { console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown); } phpbb.clearLoadingTimeout(); - var errorText = false; - if (typeof errorThrown === 'string' && errorThrown.length > 0) { + var responseText, errorText = false; + try { + responseText = JSON.parse(jqXHR.responseText); + responseText = responseText.message; + } catch (e) {} + if (typeof responseText === 'string' && responseText.length > 0) { + errorText = responseText; + } + else if (typeof errorThrown === 'string' && errorThrown.length > 0) { errorText = errorThrown; } else { |