diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-16 10:00:45 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-16 10:00:45 +0000 |
| commit | e0ca9946b9e107251ee556b5f604f90eb6c2eb85 (patch) | |
| tree | eb273c799ac71d54f3130f4c360f0e41f76192b5 | |
| parent | 32fe40c70bd9c6a8a3056c084c5012293c96f58b (diff) | |
| download | forums-e0ca9946b9e107251ee556b5f604f90eb6c2eb85.tar forums-e0ca9946b9e107251ee556b5f604f90eb6c2eb85.tar.gz forums-e0ca9946b9e107251ee556b5f604f90eb6c2eb85.tar.bz2 forums-e0ca9946b9e107251ee556b5f604f90eb6c2eb85.tar.xz forums-e0ca9946b9e107251ee556b5f604f90eb6c2eb85.zip | |
Cleaning up.
git-svn-id: file:///svn/phpbb/trunk@7602 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions_user.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_avatar_options.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 375d85a34a..3da49026c9 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1803,6 +1803,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var } $template->assign_vars(array( + 'S_AVATARS_ENABLED' => true, 'S_IN_AVATAR_GALLERY' => true, 'S_CAT_OPTIONS' => $s_category_options) ); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e8c4804e5a..db91c90803 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -544,10 +544,13 @@ class ucp_profile } else { + $avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false; + $template->assign_vars(array( 'AVATAR_WIDTH' => request_var('width', $user->data['user_avatar_width']), 'AVATAR_HEIGHT' => request_var('height', $user->data['user_avatar_height']), + 'S_AVATARS_ENABLED' => $avatars_enabled, 'S_UPLOAD_AVATAR_FILE' => $can_upload, 'S_UPLOAD_AVATAR_URL' => $can_upload, 'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false, diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 3be5543998..d43e76e584 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -1,7 +1,7 @@ <div class="panel"> <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> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index d49be1d96b..c8f5608c57 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -16,7 +16,7 @@ <!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> <!-- ENDIF --></td> </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> <td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td> </tr> |