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

diff --git a/languages/en.php b/languages/en.php
index ef3c8349b014d3b4720271e69fad1b8720ac1977..14df3db3406e348a9b53dd26812bfc4fba0e2151 100644 (file)
--- 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 707402c6427ed174a2d16963920cd2fe34b0f44f..63518a4139d8dcf4623e6e4b8a019985fff5aa93 100644 (file)
--- 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 5bbfa6dff506328acb1e0caeb0a6aab80698cae6..aa9ee8beeac98a726629d4047b441fb4ab3fedd1 100644 (file)
--- 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 601faf16fcdbf600e97719b2f95396a465e92b9b..0e1511334eeaf0e1b4f28acf8aadc04bbdf379a1 100644 (file)
--- 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));