Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12375] Fix broken attachment deletion.
This commit is contained in:
Joas Schilling 2014-04-10 12:04:28 +02:00
commit 52f415cfdc

View file

@ -253,10 +253,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
};
var done = function(response) {
var json = {};
try {
json = $.parseJSON(response);
} catch (e) {
if (typeof response !== 'object') {
return;
}