diff options
| author | Cesar G <prototech91@gmail.com> | 2014-04-08 21:49:15 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-08 21:51:56 -0700 |
| commit | 934696766abc5e2facdae74d7c7881c232473b22 (patch) | |
| tree | dc279e14fb9c512ff95e7fe6b32c54dd25be66ed /phpBB/assets/javascript | |
| parent | 0e3e715a48f99745eab30683b27e953dac07626c (diff) | |
| download | forums-934696766abc5e2facdae74d7c7881c232473b22.tar forums-934696766abc5e2facdae74d7c7881c232473b22.tar.gz forums-934696766abc5e2facdae74d7c7881c232473b22.tar.bz2 forums-934696766abc5e2facdae74d7c7881c232473b22.tar.xz forums-934696766abc5e2facdae74d7c7881c232473b22.zip | |
[ticket/12375] Fix broken attachment deletion.
The response is already parsed and when running it through parseJSON returned
null prior to 1.9. Now there's an actual error thrown, so the function is
returning and thus leaving the attachment row intact.
PHPBB3-12375
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index 3c2fc5c3cb..8ffd452a09 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -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; } |