Upgraded to Elgg 1.8.4.

4 files changed, 16 insertions, 2 deletions

diff --git a/pages/avatar/edit.php b/pages/avatar/edit.php
index eef8f8f8b..c71633b8b 100644
--- a/pages/avatar/edit.php
+++ b/pages/avatar/edit.php
@@ -10,8 +10,13 @@ elgg_set_context('profile_edit');
 
 $title = elgg_echo('avatar:edit');
 
-$content = elgg_view('core/avatar/upload', array('entity' => elgg_get_page_owner_entity()));
-$content .= elgg_view('core/avatar/crop', array('entity' => elgg_get_page_owner_entity()));
+$entity = elgg_get_page_owner_entity();
+$content = elgg_view('core/avatar/upload', array('entity' => $entity));
+
+// only offer the crop view if an avatar has been uploaded
+if (isset($entity->icontime)) {
+	$content .= elgg_view('core/avatar/crop', array('entity' => $entity));
+}
 
 $params = array(
 	'content' => $content,
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));