diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-10-05 13:44:12 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-10-05 13:44:12 +0000 |
| commit | 1eb6d4aebdc29b170113850eccf57b629f009904 (patch) | |
| tree | 73b6fa425ce4c97df3a3b94aca7a25b21db4d80e | |
| parent | 7baf3ed1401d44304c01d4374a176cc62008108d (diff) | |
| download | forums-1eb6d4aebdc29b170113850eccf57b629f009904.tar forums-1eb6d4aebdc29b170113850eccf57b629f009904.tar.gz forums-1eb6d4aebdc29b170113850eccf57b629f009904.tar.bz2 forums-1eb6d4aebdc29b170113850eccf57b629f009904.tar.xz forums-1eb6d4aebdc29b170113850eccf57b629f009904.zip | |
#14636
git-svn-id: file:///svn/phpbb/trunk@8144 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8c23eabbb0..065408d5be 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -113,6 +113,7 @@ <li>[Fix] Fixing google cache display problems with Firefox (#14472) - patch provided by Raimon</li> <li>[Fix] Prevent topic unlocking if locked by someone else while posting (#10307)</li> <li>[Change] Allow years in future be selected for date custom profile field (#14519)</li> + <li>[Fix] Don't display "Avatars Disabled" message on edit groups in UCP (#14636)</li> </ul> diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index d8d4a285d4..cc428d98eb 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -642,6 +642,9 @@ class ucp_groups { avatar_gallery($category, $avatar_select, 4); } + + $avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false; + $template->assign_vars(array( 'S_EDIT' => true, @@ -650,6 +653,7 @@ class ucp_groups 'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '', 'S_ERROR' => (sizeof($error)) ? true : false, 'S_SPECIAL_GROUP' => ($group_type == GROUP_SPECIAL) ? true : false, + 'S_AVATARS_ENABLED' => $avatars_enabled, 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, |