makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 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.
This commit is contained in:
Andreas Fischer 2015-08-05 13:41:59 +02:00
commit 50cf610eb6
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/assets/javascript/plupload.js
View file

@ -281,7 +281,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
$.ajax(phpbb.plupload.config.url, { $.ajax(phpbb.plupload.config.url, {
type: 'POST', type: 'POST',
data: $.extend(fields, phpbb.plupload.getSerializedData()), data: $.extend(fields, phpbb.plupload.getSerializedData()),
headers: { 'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest' } headers: phpbb.plupload.config.headers
}) })
.always(always) .always(always)
.done(done); .done(done);

17
phpBB/assets/plupload/plupload.full.min.js vendored
View file

File diff suppressed because one or more lines are too long