aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-02-17 15:11:24 -0800
committerCesar G <prototech91@gmail.com>2014-02-17 15:11:24 -0800
commit1c56d28d9bd26d0a269084326e998c88e810d9f4 (patch)
tree9ec686899e3e4e97f36d5a371996b996f6adfeb3
parent9f923f235947b75260630234268d119179adda3e (diff)
downloadforums-1c56d28d9bd26d0a269084326e998c88e810d9f4.tar
forums-1c56d28d9bd26d0a269084326e998c88e810d9f4.tar.gz
forums-1c56d28d9bd26d0a269084326e998c88e810d9f4.tar.bz2
forums-1c56d28d9bd26d0a269084326e998c88e810d9f4.tar.xz
forums-1c56d28d9bd26d0a269084326e998c88e810d9f4.zip
[ticket/12208] Remove file from upload queue if deleted before being uploaded.
The table row is removed, but the files aren't actually removed from the upload queue, so they get uploaded either way. PHPBB3-12208
-rw-r--r--phpBB/assets/javascript/plupload.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index a90757d487..91a9806955 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -230,6 +230,9 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
phpbb.plupload.deleteFile = function(row, attachId) {
// If there's no attach id, then the file hasn't been uploaded. Simply delete the row.
if (typeof attachId === 'undefined') {
+ var file = uploader.getFile(row.attr('id'));
+ uploader.removeFile(file);
+
row.slideUp(100, function() {
row.remove();
phpbb.plupload.hideEmptyList();