diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-08-05 13:41:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-08-05 13:41:59 +0200 |
| commit | 50cf610eb6738d2577c44f423c072727451b70f4 (patch) | |
| tree | 2a196491f6139faff08f3ca03ca2801c685952ed /phpBB/assets/javascript | |
| parent | cbe74844b01f72d2007376ceafdf979a6cc94d47 (diff) | |
| parent | b34e74254a83a3b43255aece377eb9cf097c3037 (diff) | |
| download | forums-50cf610eb6738d2577c44f423c072727451b70f4.tar forums-50cf610eb6738d2577c44f423c072727451b70f4.tar.gz forums-50cf610eb6738d2577c44f423c072727451b70f4.tar.bz2 forums-50cf610eb6738d2577c44f423c072727451b70f4.tar.xz forums-50cf610eb6738d2577c44f423c072727451b70f4.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14049] Use headers from config when sending Plupload delete request.
[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index 96e5ca96e6..8b3543880f 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -281,7 +281,7 @@ phpbb.plupload.deleteFile = function(row, attachId) { $.ajax(phpbb.plupload.config.url, { type: 'POST', data: $.extend(fields, phpbb.plupload.getSerializedData()), - headers: { 'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest' } + headers: phpbb.plupload.config.headers }) .always(always) .done(done); |