diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 23:48:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 23:48:45 +0200 |
| commit | 85407986ead970b60ca75fdada9de774248c9a81 (patch) | |
| tree | 3f9da4312208b738c514bfcaa3c5fab8820d0836 | |
| parent | 5cae8225943c5041c464dcad4576a1625e79bd5b (diff) | |
| parent | c2866f52453ac8bdfcdde6b541bbba60f1c71d02 (diff) | |
| download | forums-85407986ead970b60ca75fdada9de774248c9a81.tar forums-85407986ead970b60ca75fdada9de774248c9a81.tar.gz forums-85407986ead970b60ca75fdada9de774248c9a81.tar.bz2 forums-85407986ead970b60ca75fdada9de774248c9a81.tar.xz forums-85407986ead970b60ca75fdada9de774248c9a81.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10300' into develop
* nickvergessen/ticket/10300:
[ticket/10300] Always set group attributes for teampage and legend
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index dde556c19e..221dea2345 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -415,6 +415,9 @@ class acp_groups // Only set the rank, colour, etc. if it's changed or if we're adding a new // group. This prevents existing group members being updated if no changes // were made. + // However there are some attributes that need to be set everytime, + // otherwise the group gets removed from the feature. + $set_attributes = array('legend', 'teampage'); $group_attributes = array(); $test_variables = array( @@ -435,7 +438,7 @@ class acp_groups foreach ($test_variables as $test => $type) { - if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test])) + if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || in_array($test, $set_attributes))) { settype($submit_ary[$test], $type); $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; |