From 65c5ba06227db6c4847fbe17a1ac35a52ed40b02 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 24 May 2010 15:40:47 +0000 Subject: The activity stream's count uses the river table instead of trying to combine entities + annotations based up on time_created. Also brought small bits of code up to standards. git-svn-id: http://code.elgg.org/elgg/trunk@6173 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/river/item/list.php | 2 +- .../views/default/river/item/wrapper.php | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'mod/riverdashboard/views/default/river') diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php index 4c3e240ac..bddb2f5e4 100644 --- a/mod/riverdashboard/views/default/river/item/list.php +++ b/mod/riverdashboard/views/default/river/item/list.php @@ -16,7 +16,7 @@ if (isset($vars['items']) && is_array($vars['items'])) { if ($vars['pagination'] !== false) { $baseurl = $_SERVER['REQUEST_URI']; - $baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); + $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); $nav = ''; diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index 8506262a8..b90b00f99 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -41,31 +41,31 @@ if ($comment_count < 3) { $user, 'size' => 'small')); ?>
- "; - + if ($comment_count <= 3) { echo "Comments"; } - + //display 'more comments' if there are any if ($num_comments != 0) { echo "Comments (+{$num_comments} more)"; } - + if ($numoflikes != 0) { echo elgg_view('likes/forms/display', array('entity' => $object)); } echo "
"; // close river_comments_tabs - + echo "
"; if ($numoflikes != 0) { @@ -74,7 +74,7 @@ if ($get_comments){ echo list_annotations($object->getGUID(), 'likes', 99); echo "
"; } - + foreach ($get_comments as $gc) { //get the comment owner $comment_owner = get_user($gc->owner_guid); @@ -107,7 +107,7 @@ if ($get_comments){ } else { // tab bar nav - for users that liked object $numoflikes = elgg_count_likes($object); - + if ($vars['item']->type != 'user' && $numoflikes != 0) { echo "
"; } @@ -117,7 +117,7 @@ if ($get_comments){ if ($vars['item']->type != 'user' && $numoflikes != 0) { echo "
"; // close river_comments_tabs } - + if ($vars['item']->type != 'user') { echo "
"; } @@ -127,7 +127,7 @@ if ($get_comments){ echo list_annotations($object->getGUID(), 'likes', 99); echo "
"; } - + // if there are no comments to display // and this is not a user or a group discussion entry - include the inline comment form if ($vars['item']->type != 'user' && $vars['item']->subtype != 'groupforumtopic') { -- cgit v1.2.3