github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert b198927; always attempt to parse JSON

Browse Source 
This way if there is a PHP error which outputs a 200 OK text/html response, Flarum will correctly show an error message.
This commit is contained in:
Toby Zerner 2015-10-31 14:49:14 +10:30
parent 7e3268be4c
commit ef9e438981
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/core/js/lib/App.js
View File

@ -227,12 +227,10 @@ export default class App {
throw new RequestError(status, responseText, options, xhr);
}
if (xhr.getResponseHeader('content-type').indexOf('json') !== -1) {
try {
return JSON.parse(responseText);
} catch (e) {
throw new RequestError(500, responseText, options, xhr);
}
try {
return JSON.parse(responseText);
} catch (e) {
throw new RequestError(500, responseText, options, xhr);
}
};