Revert e1315d2; always attempt to parse JSON

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 7d4a04760c
commit 119d1721e0

View File

@ -227,13 +227,11 @@ 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);
}
}
};
if (this.requestError) this.alerts.dismiss(this.requestError.alert);