From b081729f25dab258ac4259907ba1af1a16ee8138 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:47:58 -0500
Subject: [PATCH] [ticket/11103] Revert the changes to functions_display.php

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
---
 phpBB/includes/functions_display.php    | 7 +++----
 phpBB/styles/prosilver/theme/common.css | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 84cb47867e..8328b9ee7a 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -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 $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 string $custom_css Custom CSS class to apply to the 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 $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
 	* @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)));
 
 	if ($overwrite_avatar)
@@ -1386,7 +1385,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	}
 
 	$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) . '" />';
 }
 
 /**
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a3f2a83886..a1c71fe228 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -666,7 +666,7 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
-.notifications-avatar {
+#notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;