mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander
2017-01-14 14:59:04 +01:00
parent 26c6cb819e 8af6df3946
commit d226059b98
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/overall_header.html
View File

@@ -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;
}

2
phpBB/adm/style/simple_header.html
View File

@@ -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;
}

2
phpBB/styles/prosilver/template/forum_fn.js
View File

@@ -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);
}
});