mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00
Code Issues Releases Wiki Activity

[ticket/13771] Only handle valid JQHXR response objects

Browse Source 
PHPBB3-13771
This commit is contained in:
Matt Friedman
2015-05-04 10:27:11 -07:00
parent 4a7f905c6a
commit c7a0b4479d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,10 +262,13 @@ phpbb.ajaxify = function(options) {
console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown); console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
} }
phpbb.clearLoadingTimeout(); phpbb.clearLoadingTimeout();
var errorText = false; var responseText, errorText = false;
var responseText = $.parseJSON(jqXHR.responseText); try {
if (typeof responseText.message === 'string' && responseText.message.length > 0) { responseText = JSON.parse(jqXHR.responseText);
errorText = responseText.message; responseText = responseText.message;
} catch (e) {}
if (typeof responseText === 'string' && responseText.length > 0) {
errorText = responseText;
} }
else if (typeof errorThrown === 'string' && errorThrown.length > 0) { else if (typeof errorThrown === 'string' && errorThrown.length > 0) {
errorText = errorThrown; errorText = errorThrown;