From da25d56fa09aeb8ee21767e60b27d854505cd8cd Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 6 Mar 2013 17:56:19 -0500
Subject: Fixes #5058 not forcing a size on an image

---
 views/default/icon/default.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'views/default/icon/default.php')

diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index 087c7eae9..25175b0f4 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -37,12 +37,19 @@ if (isset($vars['href'])) {
 $icon_sizes = elgg_get_config('icon_sizes');
 $size = $vars['size'];
 
+if (!isset($vars['width'])) {
+	$vars['width'] = $size != 'master' ? $icon_sizes[$size]['w'] : null;
+}
+if (!isset($vars['height'])) {
+	$vars['height'] = $size != 'master' ? $icon_sizes[$size]['h'] : null;
+}
+
 $img = elgg_view('output/img', array(
 	'src' => $entity->getIconURL($vars['size']),
 	'alt' => $title,
 	'class' => $class,
-	'width' => $size != 'master' ? $icon_sizes[$size]['w'] : NULL,
-	'height' => $size != 'master' ? $icon_sizes[$size]['h'] : NULL,
+	'width' => $vars['width'],
+	'height' => $vars['height'],
 ));
 
 if ($url) {
-- 
cgit v1.2.3


From d07700e172c37c7af64ba1be5032330ba9766cb0 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 8 Mar 2013 13:59:46 -0500
Subject: IE7 does not like empty img width/height

---
 views/default/icon/default.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'views/default/icon/default.php')

diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index 25175b0f4..7f13a1189 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -44,13 +44,24 @@ if (!isset($vars['height'])) {
 	$vars['height'] = $size != 'master' ? $icon_sizes[$size]['h'] : null;
 }
 
-$img = elgg_view('output/img', array(
+$img_params = array(
 	'src' => $entity->getIconURL($vars['size']),
-	'alt' => $title,
-	'class' => $class,
-	'width' => $vars['width'],
-	'height' => $vars['height'],
-));
+	'alt' => $title,	
+);
+
+if (!empty($class)) {
+	$img_params['class'] = $class;
+}
+
+if (!empty($vars['width'])) {
+	$img_params['width'] = $vars['width'];
+}
+
+if (!empty($vars['height'])) {
+	$img_params['height'] = $vars['height'];
+}
+
+$img = elgg_view('output/img', $img_params);
 
 if ($url) {
 	$params = array(
-- 
cgit v1.2.3