diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:03:41 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:03:41 +0200 |
| commit | 15dfa9bba2556e93c899e7266168bfe4fea9ed3b (patch) | |
| tree | 77a465aee8a271764df87737a2f4ef3453b301ee /phpBB/assets/javascript/plupload.js | |
| parent | 20c6139ad1a556288e89648c7b5a2951009a3ddc (diff) | |
| parent | 934696766abc5e2facdae74d7c7881c232473b22 (diff) | |
| download | forums-15dfa9bba2556e93c899e7266168bfe4fea9ed3b.tar forums-15dfa9bba2556e93c899e7266168bfe4fea9ed3b.tar.gz forums-15dfa9bba2556e93c899e7266168bfe4fea9ed3b.tar.bz2 forums-15dfa9bba2556e93c899e7266168bfe4fea9ed3b.tar.xz forums-15dfa9bba2556e93c899e7266168bfe4fea9ed3b.zip | |
Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeus
* prototech/ticket/12375:
[ticket/12375] Fix broken attachment deletion.
Diffstat (limited to 'phpBB/assets/javascript/plupload.js')
| -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; } |