2 files changed, 1 insertions, 47 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 63633d3b5..c6fea8b41 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -53,7 +53,7 @@ if ($full_view) {
 </p>
 HTML;
 
-	echo elgg_view_media($commenter_icon, $body, array('id' => "comment-$comment->id"));
+	echo elgg_view_media($commenter_icon, $body);
 
 } else {
 	// brief view
diff --git a/views/default/annotation/list.php b/views/default/annotation/list.php
deleted file mode 100644
index f432ad640..000000000
--- a/views/default/annotation/list.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Annotation list
- *
- * @uses $vars['annotations']
- * @uses $vars['limit']
- * @uses $vars['offset']
- * @uses $vars['count']
- * @uses $vars['pagination']
- */
-
-$offset = $vars['offset'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$annotations = $vars['annotations'];
-$pagination = elgg_get_array_value('pagination', $vars, true);
-
-$html = "";
-$nav = "";
-
-if ($pagination) {
-	$nav .= elgg_view('navigation/pagination', array(
-		'baseurl' => $_SERVER['REQUEST_URI'],
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-		'word' => 'annoff',
-		'nonefound' => false,
-	));
-}
-
-if (is_array($annotations) && count($annotations) > 0) {
-	$html .= '<ul class="elgg-annotation-list elgg-list">';
-	foreach ($annotations as $annotation) {
-			$html .= '<li>';
-			$html .= elgg_view_annotation($annotation, true);
-			$html .= '</li>';
-	}
-	$html .= '</ul>';
-}
-
-if ($count) {
-	$html .= $nav;
-}
-
-echo $html;