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

Cleaning up.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7602 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-05-16 10:00:45 +00:00
parent 32fe40c70b
commit e0ca9946b9
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/functions_user.php
View file

@ -1803,6 +1803,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var
} }
$template->assign_vars(array( $template->assign_vars(array(
'S_AVATARS_ENABLED' => true,
'S_IN_AVATAR_GALLERY' => true, 'S_IN_AVATAR_GALLERY' => true,
'S_CAT_OPTIONS' => $s_category_options) 'S_CAT_OPTIONS' => $s_category_options)
); );

3
phpBB/includes/ucp/ucp_profile.php
View file

@ -544,10 +544,13 @@ class ucp_profile
} }
else else
{ {
$avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
$template->assign_vars(array( $template->assign_vars(array(
'AVATAR_WIDTH' => request_var('width', $user->data['user_avatar_width']), 'AVATAR_WIDTH' => request_var('width', $user->data['user_avatar_width']),
'AVATAR_HEIGHT' => request_var('height', $user->data['user_avatar_height']), 'AVATAR_HEIGHT' => request_var('height', $user->data['user_avatar_height']),
'S_AVATARS_ENABLED' => $avatars_enabled,
'S_UPLOAD_AVATAR_FILE' => $can_upload, 'S_UPLOAD_AVATAR_FILE' => $can_upload,
'S_UPLOAD_AVATAR_URL' => $can_upload, 'S_UPLOAD_AVATAR_URL' => $can_upload,
'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false, 'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,

2
phpBB/styles/prosilver/template/ucp_avatar_options.html
View file

@ -1,7 +1,7 @@
<div class="panel"> <div class="panel">
<div class="inner"><span class="corners-top"><span></span></span> <div class="inner"><span class="corners-top"><span></span></span>
<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_IN_AVATAR_GALLERY and not S_DISPLAY_GALLERY --> <!-- IF not S_AVATARS_ENABLED -->
<p>{L_AVATAR_FEATURES_DISABLED}</p> <p>{L_AVATAR_FEATURES_DISABLED}</p>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
View file

@ -16,7 +16,7 @@
<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> <!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
<!-- ENDIF --></td> <!-- ENDIF --></td>
</tr> </tr>
<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_IN_AVATAR_GALLERY and not S_DISPLAY_GALLERY --> <!-- IF not S_AVATARS_ENABLED -->
<tr> <tr>
<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td> <td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
</tr> </tr>