From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 9 Feb 2012 11:59:38 +0000 (-0500)
Subject: Fixes #2942 all list pages should have messages when no content now
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ff3b73dfc3be67b579b8cbedd407c921046892ac;p=lorea%2Felgg.git

Fixes #2942 all list pages should have messages when no content now
---

diff --git a/languages/en.php b/languages/en.php
index ef3c8349b..14df3db34 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -331,7 +331,7 @@ $english = array(
 	'friends:remove:successful' => "You have successfully removed %s from your friends.",
 	'friends:remove:failure' => "We couldn't remove %s from your friends.",
 
-	'friends:none' => "This user hasn't added anyone as a friend yet.",
+	'friends:none' => "No friends yet.",
 	'friends:none:you' => "You don't have any friends yet.",
 
 	'friends:none:found' => "No friends were found.",
diff --git a/pages/friends/index.php b/pages/friends/index.php
index 707402c64..63518a413 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -22,6 +22,9 @@ $options = array(
 	'full_view' => FALSE
 );
 $content = elgg_list_entities_from_relationship($options);
+if (!$content) {
+	$content = elgg_echo('friends:none');
+}
 
 $params = array(
 	'content' => $content,
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 5bbfa6dff..aa9ee8bee 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -22,6 +22,9 @@ $options = array(
 	'full_view' => FALSE
 );
 $content = elgg_list_entities_from_relationship($options);
+if (!$content) {
+	$content = elgg_echo('friends:none');
+}
 
 $params = array(
 	'content' => $content,
diff --git a/pages/river.php b/pages/river.php
index 601faf16f..0e1511334 100644
--- a/pages/river.php
+++ b/pages/river.php
@@ -40,6 +40,9 @@ switch ($page_type) {
 }
 
 $activity = elgg_list_river($options);
+if (!$activity) {
+	$activity = elgg_echo('river:none');
+}
 
 $content = elgg_view('core/river/filter', array('selector' => $selector));