Fixes #121 and #143. Please confirm.

git-svn-id: https://code.elgg.org/elgg/trunk@1717 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 2 deletions

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 9fa93b172..3b69efd1c 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -410,13 +410,15 @@
 	 * @param int $offset An offset

 	 * @return array of river entities rendered with the appropriate view.

 	 */

-	function get_river_entries_friends($by_user, $limit = 10, $offset = 0) {

+	function get_river_entries_friends($by_user, $limit = 10, $offset = 0) {
+		$friendsarray = "";

 		if ($friends = get_user_friends($by_user, "", 9999)) {

 			$friendsarray = array();

 			foreach($friends as $friend) {

 				$friendsarray[] = $friend->getGUID();

 			}

-		}

+		}
+		

 		return get_river_entries($friendsarray,"",$limit,$offset);

 	}