From 95920add94d9056806538da00f28e73dba5932bc Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Wed, 20 Feb 2013 20:08:34 +0100
Subject: Fixes #5106. Do not make big group description images.

---
 mod/groups/views/default/groups/css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/groups/views/default/groups/css.php')

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 6f710ddab..39246f856 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -9,7 +9,7 @@
 .groups-profile > .elgg-image {
 	margin-right: 10px;
 }
-.groups-profile img {
+.groups-profile-icon img {
 	width: 100%;
 	height: auto;
 }
-- 
cgit v1.2.3


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

---
 mod/groups/views/default/groups/css.php             |  4 ----
 mod/groups/views/default/groups/profile/summary.php |  9 ++++++++-
 views/default/icon/default.php                      | 11 +++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'mod/groups/views/default/groups/css.php')

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 39246f856..32dd2b74d 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -9,10 +9,6 @@
 .groups-profile > .elgg-image {
 	margin-right: 10px;
 }
-.groups-profile-icon img {
-	width: 100%;
-	height: auto;
-}
 .groups-stats {
 	background: #eeeeee;
 	padding: 5px;
diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php
index f1221f19a..3f7496871 100644
--- a/mod/groups/views/default/groups/profile/summary.php
+++ b/mod/groups/views/default/groups/profile/summary.php
@@ -25,7 +25,14 @@ if (!$owner) {
 <div class="groups-profile clearfix elgg-image-block">
 	<div class="elgg-image">
 		<div class="groups-profile-icon">
-			<?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?>
+			<?php
+				// we don't force icons to be square so don't set width/height
+				echo elgg_view_entity_icon($group, 'large', array(
+					'href' => '',
+					'width' => '',
+					'height' => '',
+				)); 
+			?>
 		</div>
 		<div class="groups-stats">
 			<p>
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