diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-27 15:49:16 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-01-17 19:20:36 -0800 |
| commit | 8b351104edf7dbe974de6d52851ca402769bf101 (patch) | |
| tree | 8d46bfde0e368b6fddb5eb1e7a7daed9b12267b3 /phpBB | |
| parent | a70f08513d588b4a2966f140769cb71ef228b480 (diff) | |
| download | forums-8b351104edf7dbe974de6d52851ca402769bf101.tar forums-8b351104edf7dbe974de6d52851ca402769bf101.tar.gz forums-8b351104edf7dbe974de6d52851ca402769bf101.tar.bz2 forums-8b351104edf7dbe974de6d52851ca402769bf101.tar.xz forums-8b351104edf7dbe974de6d52851ca402769bf101.zip | |
[ticket/11915] Check if trigger_error() was called after sending chunk.
PHPBB3-11915
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index f30ba9b33e..44e385f9d5 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -563,6 +563,11 @@ uploader.bind('ChunkUploaded', function(up, file, response) { }); } + // If trigger_error() was called, then a permission error likely occurred. + if (typeof json.title !== 'undefined') { + json.error = {message: json.message}; + } + if (json.error) { file.status = plupload.FAILED; up.trigger('FileUploaded', file, { |