Merge branch 'master' of github.com:brettp/Elgg

2 files changed, 11 insertions, 9 deletions

diff --git a/views/default/widgets/content_stats/content.php b/views/default/widgets/content_stats/content.php
index 7086e4b9e..6a652166c 100644
--- a/views/default/widgets/content_stats/content.php
+++ b/views/default/widgets/content_stats/content.php
@@ -19,7 +19,9 @@ foreach ($object_stats as $subtype => $num) {
 }
 echo '</table>';
 
+echo '<div class="mtm">';
 echo elgg_view('output/url', array(
 	'href' => 'admin/statistics/overview',
-	'text' => 'more',
+	'text' => elgg_echo('more'),
 ));
+echo '</div>';
diff --git a/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php
index 4c5ef5b4a..bb5bd7a8d 100644
--- a/views/default/widgets/friends/content.php
+++ b/views/default/widgets/friends/content.php
@@ -13,12 +13,12 @@ $num = (int) $vars['entity']->num_display;
 // get the correct size
 $size = $vars['entity']->icon_size;
 
-$html = $owner->listFriends('', $num, array(
-	'size' => $size,
-	'gallery' => true,
-));
-if ($html) {
-	echo $html;
-} else {
-
+if (elgg_instanceof($owner, 'user')) {
+	$html = $owner->listFriends('', $num, array(
+		'size' => $size,
+		'list_type' => 'gallery',
+	));
+	if ($html) {
+		echo $html;
+	}
 }