Fixed activity stream ecml view.

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

diff --git a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
index 87c048ea5ff1bf2725c0cfc53b0d207bbcc80b22..93b7e168f844ee08ee524d031f8fdd9d61401d31 100644 (file)
--- a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
+++ b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
@@ -9,19 +9,20 @@
  * @link http://elgg.org/
  */
 
-$user = (isset($vars['user'])) ? $vars['user'] : NULL;
+// $vars['user'] is apparently the loggedin user.
+$owner = (isset($vars['owner'])) ? $vars['owner'] : NULL;
 $type = (isset($vars['type'])) ? $vars['type'] : NULL;
 $subtype = (isset($vars['subtype'])) ? $vars['subtype'] : NULL;
 $limit = (isset($vars['limit'])) ? $vars['limit'] : 10;
 
 // resolve usernames to guids
-if (!is_numeric($user)) {
-       if ($user_obj = get_user_by_username($user)) {
-               $user = $user_obj->getGUID();
+if ($owner && !is_numeric($owner)) {
+       if ($user_obj = get_user_by_username($owner)) {
+               $owner = $user_obj->getGUID();
        }
 }
 
-$river = elgg_view_river_items($user, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
+$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334',$river);