added the core river to the tabbed profile plugin and fixed some deprecated function warnings

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

1 files changed, 6 insertions, 25 deletions

diff --git a/mod/tabbed_profile/views/default/profile/tabs/activity.php b/mod/tabbed_profile/views/default/profile/tabs/activity.php
index ccd2a3915..7a7bffb94 100755
--- a/mod/tabbed_profile/views/default/profile/tabs/activity.php
+++ b/mod/tabbed_profile/views/default/profile/tabs/activity.php
@@ -2,31 +2,12 @@
 /**
  * Elgg user display (details)
  * @uses $vars['entity'] The user entity
- *
- * @todo this needs to recieve a list of activity or HTML in $vars that's generated by a plugin hook.
- * None of this logic should be here.
  */
-$limit = 20;
 
-if (is_plugin_enabled('thewire')) {
-	// users last status msg, if they posted one
-	echo elgg_view("profile/status", array("entity" => $vars['entity']));
-}
+echo elgg_view('profile/status', array("entity" => $vars['entity']));
 
-if (is_plugin_enabled('conversations')) {
-	// users last status msg, if they posted one
-	echo elgg_view("profile/status", array("entity" => $vars['entity']));
-}
-
-if (is_plugin_enabled('riverdashboard')) {
-	//select the correct river
-	if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic') {
-		echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,true);
-	} else {
-		echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
-		echo elgg_view('riverdashboard/js');
-	}
-} else {
-	// @todo this should not be here.
-	echo "Riverdashboard not loaded";
-}
\ No newline at end of file
+$params = array(
+	'subject_guid' => $vars['entity']->guid,
+	'limit' => 5,
+);
+echo elgg_list_river($params);