makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 18:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/assets/javascript/plupload.js
View file

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