moved the count comments and likes functions into the ElggEntity class

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

4 files changed, 4 insertions, 4 deletions

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 3c5003310..78470d6be 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -28,7 +28,7 @@ $date = elgg_view_friendly_time($blog->publish_date);
 
 // The "on" status changes for comments, so best to check for !Off
 if ($blog->comments_on != 'Off') {
-	$comments_count = elgg_count_comments($blog);
+	$comments_count = $blog->countComments();
 	//only display if there are commments
 	if ($comments_count != 0) {
 		$text = elgg_echo("comments") . " ($comments_count)";
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 89367feb3..5fcd2a023 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -37,7 +37,7 @@ $file_icon = elgg_view('file/icon', array(
 $tags = elgg_view('output/tags', array('tags' => $file->tags));
 $date = elgg_view_friendly_time($file->time_created);
 
-$comments_count = elgg_count_comments($file);
+$comments_count = $file->countComments();
 //only display if there are commments
 if ($comments_count != 0) {
 	$text = elgg_echo("comments") . " ($comments_count)";
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index c6f9da4b4..6d4902c87 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -28,7 +28,7 @@ $date = elgg_view_friendly_time($topic->time_created);
 
 $comments_link = '';
 $comments_text = '';
-$num_comments = elgg_count_comments($topic);
+$num_comments = $topic->countComments();
 if ($num_comments != 0) {
 	$last_comment = $topic->getAnnotations("generic_comment", 1, 0, "desc");
 	$commenter = $last_comment[0]->getOwnerEntity();
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 9770dce23..89ef25572 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -39,7 +39,7 @@ $date = elgg_view_friendly_time($annotation->time_created);
 $editor_text = elgg_echo('pages:strapline', array($date, $editor_link));
 $tags = elgg_view('output/tags', array('tags' => $page->tags));
 
-$comments_count = elgg_count_comments($page);
+$comments_count = $page->countComments();
 //only display if there are commments
 if ($comments_count != 0 && !$revision) {
 	$text = elgg_echo("comments") . " ($comments_count)";