Refs #4437 let the object/elements/summary view handle the tags

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index aa8074a69c700e1d2a0fd5dbde281b51103ff569..4403a6006f5d80dc5ca4cf5f0b005d0052295472 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -27,7 +27,6 @@ $owner_link = elgg_view('output/url', array(
        'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
-$tags = elgg_view('output/tags', array('tags' => $blog->tags));
 $date = elgg_view_friendly_time($blog->time_created);
 
 // The "on" status changes for comments, so best to check for !Off
@@ -74,7 +73,6 @@ if ($full) {
                'title' => false,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
        );
        $params = $params + $vars;
        $summary = elgg_view('object/elements/summary', $params);
@@ -92,7 +90,6 @@ if ($full) {
                'entity' => $blog,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
                'content' => $excerpt,
        );
        $params = $params + $vars;

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 89a0d03e0dfc3e5297d9266bb291c6825e685c5b..83bae2b13b95cdf157378be89b20454a94108176 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -27,7 +27,6 @@ $owner_link = elgg_view('output/url', array(
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 
-$tags = elgg_view('output/tags', array('tags' => $bookmark->tags));
 $date = elgg_view_friendly_time($bookmark->time_created);
 
 $comments_count = $bookmark->countComments();
@@ -64,7 +63,6 @@ if ($full && !elgg_in_context('gallery')) {
                'title' => false,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
        );
        $params = $params + $vars;
        $summary = elgg_view('object/elements/summary', $params);
@@ -120,7 +118,6 @@ HTML;
                'entity' => $bookmark,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
                'content' => $content,
        );
        $params = $params + $vars;

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 1db9863c9d3581356eb81515f1cfb16f0ce8ec18..b3f53018377a36c4adb9f47d48977713376eb179 100644 (file)
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -28,7 +28,6 @@ $author_text = elgg_echo('byline', array($owner_link));
 
 $file_icon = elgg_view_entity_icon($file, 'small');
 
-$tags = elgg_view('output/tags', array('tags' => $file->tags));
 $date = elgg_view_friendly_time($file->time_created);
 
 $comments_count = $file->countComments();
@@ -71,7 +70,6 @@ if ($full && !elgg_in_context('gallery')) {
                'entity' => $file,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
        );
        $params = $params + $vars;
        $summary = elgg_view('object/elements/summary', $params);
@@ -100,7 +98,6 @@ if ($full && !elgg_in_context('gallery')) {
                'entity' => $file,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
                'content' => $excerpt,
        );
        $params = $params + $vars;

diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index e78289f28446561b67095f85db84e5fe9b7e97b7..945a22eed9b95f2aac07cff33b43a858410e658b 100644 (file)
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -45,7 +45,6 @@ $editor_link = elgg_view('output/url', array(
 
 $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));
 $categories = elgg_view('output/categories', $vars);
 
 $comments_count = $page->countComments();
@@ -82,7 +81,6 @@ if ($full) {
                'entity' => $page,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
        );
        $params = $params + $vars;
        $summary = elgg_view('object/elements/summary', $params);
@@ -104,7 +102,6 @@ if ($full) {
                'entity' => $page,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
-               'tags' => $tags,
                'content' => $excerpt,
        );
        $params = $params + $vars;