aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2017-01-22 23:07:46 +0100
committerTristan Darricau <github@nicofuma.fr>2017-01-22 23:07:46 +0100
commitdcadfe092c16b539121d2118169419ed01a6cc2c (patch)
tree7365d504584f69416941c4ce8a41bdfaf6531d0b
parent3567f45e3d6872fc999862a4b0adb957149e0ed8 (diff)
parent59027c94f25d66b8fc3322902477aae350b24f75 (diff)
downloadforums-dcadfe092c16b539121d2118169419ed01a6cc2c.tar
forums-dcadfe092c16b539121d2118169419ed01a6cc2c.tar.gz
forums-dcadfe092c16b539121d2118169419ed01a6cc2c.tar.bz2
forums-dcadfe092c16b539121d2118169419ed01a6cc2c.tar.xz
forums-dcadfe092c16b539121d2118169419ed01a6cc2c.zip
Merge pull request #4665 from marc1706/ticket/15006
[ticket/15006] Pass inherit settings to form and use correct button * marc1706/ticket/15006: [ticket/15006] Pass inherit settings to form and use correct button
-rw-r--r--phpBB/adm/style/ajax.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index a7ecf8ff7b..77fd28fbe6 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -173,10 +173,11 @@ function submitPermissions() {
$.ajax({
url: $form.action,
type: 'POST',
- data: formData + '&' + $submitAllButton.name + '=' + encodeURIComponent($submitAllButton.value) +
+ data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
- '&' + $form.children('input[type=hidden]').serialize(),
+ '&' + $form.children('input[type=hidden]').serialize() +
+ '&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
success: handlePermissionReturn,
error: handlePermissionReturn
});