diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-14 14:59:04 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-14 14:59:04 +0100 |
| commit | d226059b988fd5f8963858ca698253ad6c77fea0 (patch) | |
| tree | b33e39f6776837ec3afedb1d77db80cb42c77e61 | |
| parent | 26c6cb819eea5fe67d5df7b0af3f580848b953b6 (diff) | |
| parent | 8af6df394686ead5959e7985cf7fb270772d058e (diff) | |
| download | forums-d226059b988fd5f8963858ca698253ad6c77fea0.tar forums-d226059b988fd5f8963858ca698253ad6c77fea0.tar.gz forums-d226059b988fd5f8963858ca698253ad6c77fea0.tar.bz2 forums-d226059b988fd5f8963858ca698253ad6c77fea0.tar.xz forums-d226059b988fd5f8963858ca698253ad6c77fea0.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 1e8de766ff..8279ac34dc 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -54,7 +54,7 @@ function marklist(id, name, state) for (var r = 0; r < rb.length; r++) { - if (rb[r].name.substr(0, name.length) == name) + if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true) { rb[r].checked = state; } diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 9f47b2052b..439645a211 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -66,7 +66,7 @@ function marklist(id, name, state) for (var r = 0; r < rb.length; r++) { - if (rb[r].name.substr(0, name.length) == name) + if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true) { rb[r].checked = state; } diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index b803a6f5c8..f1d423d269 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -57,7 +57,7 @@ function marklist(id, name, state) { jQuery('#' + id + ' input[type=checkbox][name]').each(function() { var $this = jQuery(this); - if ($this.attr('name').substr(0, name.length) === name) { + if ($this.attr('name').substr(0, name.length) === name && !$this.prop('disabled')) { $this.prop('checked', state); } }); |