From 1eb6d4aebdc29b170113850eccf57b629f009904 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 5 Oct 2007 13:44:12 +0000 Subject: #14636 git-svn-id: file:///svn/phpbb/trunk@8144 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/ucp/ucp_groups.php | 4 ++++ 2 files changed, 5 insertions(+) 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 @@
  • [Fix] Fixing google cache display problems with Firefox (#14472) - patch provided by Raimon
  • [Fix] Prevent topic unlocking if locked by someone else while posting (#10307)
  • [Change] Allow years in future be selected for date custom profile field (#14519)
    • +
  • [Fix] Don't display "Avatars Disabled" message on edit groups in UCP (#14636)
    • 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, -- cgit v1.2.1