From 6483d9d446e7fa50e16823fe20514a45416880e2 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 13 Nov 2011 16:22:57 -0500
Subject: Fixes #4082 adds output/img

---
 views/default/icon/default.php      |  7 +++++--
 views/default/icon/user/default.php | 12 +++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'views/default/icon')

diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index ec39e59f2..22c20b3a7 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -34,8 +34,11 @@ if (isset($vars['href'])) {
 	$url = $vars['href'];
 }
 
-$img_src = $entity->getIconURL($vars['size']);
-$img = "<img $class src=\"$img_src\" alt=\"$title\" />";
+$img = elgg_view('output/img', array(
+	'src' => $entity->getIconURL($vars['size']),
+	'alt' => $title,
+	'class' => $class,
+));
 
 if ($url) {
 	$params = array(
diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index a208ec41a..c0b0e7483 100644
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -47,7 +47,7 @@ if ($js) {
 
 $img_class = '';
 if (isset($vars['img_class'])) {
-	$img_class = "class=\"{$vars['img_class']}\"";
+	$img_class = $vars['img_class'];
 }
 
 $use_hover = elgg_extract('use_hover', $vars, true);
@@ -62,8 +62,14 @@ if (isset($vars['hover'])) {
 
 $spacer_url = elgg_get_site_url() . '_graphics/spacer.gif';
 
-$icon_url = $user->getIconURL($size);
-$icon = "<img src=\"$spacer_url\" alt=\"$name\" title=\"$name\" $img_class $js style=\"background: url($icon_url) no-repeat;\" />";
+$icon_url = elgg_format_url($user->getIconURL($size));
+$icon = elgg_view('output/img', array(
+	'src' => $spacer_url,
+	'alt' => $name,
+	'title' => $name,
+	'class' => $img_class,
+	'style' => "background: url($icon_url) no-repeat;",
+));
 
 $show_menu = $use_hover && (elgg_is_admin_logged_in() || !$user->isBanned());
 
-- 
cgit v1.2.3