diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-01-22 18:41:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-01-22 18:41:55 +0100 |
| commit | d2e395b41fa58b59a398688f23a8b10943c00955 (patch) | |
| tree | d1023e943f0335fd30f48fd087510a5ccab9b407 /phpBB/includes/acp/acp_groups.php | |
| parent | d5d282005c74a4b9539c3b37d3df723ba6e2c456 (diff) | |
| parent | 0e414f4880efa60e333a4c9183c4020f4dfad779 (diff) | |
| download | forums-d2e395b41fa58b59a398688f23a8b10943c00955.tar forums-d2e395b41fa58b59a398688f23a8b10943c00955.tar.gz forums-d2e395b41fa58b59a398688f23a8b10943c00955.tar.bz2 forums-d2e395b41fa58b59a398688f23a8b10943c00955.tar.xz forums-d2e395b41fa58b59a398688f23a8b10943c00955.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11329] Moving colors to colours.css
[ticket/9492] Fix missing phpbb_container in unit tests
[ticket/9492] Fix typo in SQL query
[ticket/9492] Ensure to delete the avatar/rank data when we change it
[ticket/9492] Ensure to update all avatar values when the avatar is changed
[ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
[ticket/9492] Add unit tests for custom ranks and avatars
[ticket/9492] Retain custom ranks and avatars when setting users default group
[ticket/11328] Replace long buttons text with short text
[ticket/11328] Add language variables for buttons
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index b604e20094..9145a20400 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -439,7 +439,7 @@ class acp_groups foreach ($test_variables as $test => $type) { - if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || in_array($test, $set_attributes))) + if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes))) { settype($submit_ary[$test], $type); $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; |