diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
commit | c56db535b4f0c943777ab159c14729d724f5d232 (patch) | |
tree | 56a63ae78f97a990d3ca1512c5333aebd467895a /phpBB/includes/ucp/ucp_groups.php | |
parent | 11aff559d4fcde5c2935aa6ebdfcfbe162d91f64 (diff) | |
parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
download | forums-c56db535b4f0c943777ab159c14729d724f5d232.tar forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.gz forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.bz2 forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.xz forums-c56db535b4f0c943777ab159c14729d724f5d232.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
-rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 69cab610fc..9635fcf079 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -577,7 +577,7 @@ class ucp_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] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0)) { settype($submit_ary[$test], $type); $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; |