makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#14636

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8144 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-10-05 13:44:12 +00:00
parent 7baf3ed140
commit 1eb6d4aebd
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -113,6 +113,7 @@
<li>[Fix] Fixing google cache display problems with Firefox (#14472) - patch provided by Raimon</li> <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>[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>[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> </ul>

4
phpBB/includes/ucp/ucp_groups.php
View file

@ -642,6 +642,9 @@ class ucp_groups
{ {
avatar_gallery($category, $avatar_select, 4); avatar_gallery($category, $avatar_select, 4);
} }
$avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false;
$template->assign_vars(array( $template->assign_vars(array(
'S_EDIT' => true, 'S_EDIT' => true,
@ -650,6 +653,7 @@ class ucp_groups
'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '', 'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '',
'S_ERROR' => (sizeof($error)) ? true : false, 'S_ERROR' => (sizeof($error)) ? true : false,
'S_SPECIAL_GROUP' => ($group_type == GROUP_SPECIAL) ? 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_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false,
'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false,