mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

[ticket/11103] Revert the changes to functions_display.php

Browse Source 
The css we need to apply to avatars can be applied through css rules.
We don't need to be able to specify a class for the img.

PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-09-15 14:47:58 -05:00
parent 7454d5c2d5
commit b081729f25
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_display.php
View File

@ -1319,11 +1319,10 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
* @param string $avatar_height Height of users avatar * @param string $avatar_height Height of users avatar
* @param string $alt Optional language string for alt tag within image, can be a language key or text * @param string $alt Optional language string for alt tag within image, can be a language key or text
* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
* @param string $custom_css Custom CSS class to apply to the image
* *
* @return string Avatar image * @return string Avatar image
*/ */
function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $custom_css = '') function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
{ {
global $user, $config, $phpbb_root_path, $phpEx; global $user, $config, $phpbb_root_path, $phpEx;
global $phpbb_dispatcher; global $phpbb_dispatcher;
@ -1344,7 +1343,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
* @var string overwrite_avatar If set, this string will be the avatar * @var string overwrite_avatar If set, this string will be the avatar
* @since 3.1-A1 * @since 3.1-A1
*/ */
$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar', 'custom_css'); $vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar');
extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars)));
if ($overwrite_avatar) if ($overwrite_avatar)
@ -1386,7 +1385,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
} }
$avatar_img .= $avatar; $avatar_img .= $avatar;
return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" ' . ($custom_css ? 'class="' . $custom_css . '"' : '') . '/>'; return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
} }
/** /**

2
phpBB/styles/prosilver/theme/common.css
View File

@ -666,7 +666,7 @@ p.rules a {
vertical-align: text-bottom; vertical-align: text-bottom;
} }
.notifications-avatar { #notification_list ul li img {
float: left; float: left;
padding: 0 10px 10px 0; padding: 0 10px 10px 0;