Merge remote branch 'upstream/master'

2 files changed, 15 insertions, 2 deletions

diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index bcd3b0c0..7d5c643a 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -36,11 +36,9 @@ class tag_Core {
     $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
     if (!$tag->loaded()) {
       $tag->name = $tag_name;
-      $tag->count = 0;
     }
 
     $tag->add($item);
-    $tag->count++;
     return $tag->save();
   }
 
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 829089c4..baf8b1ae 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -147,4 +147,19 @@ class tag_event_Core {
       }
     }
   }
+
+  static function info_block_get_metadata($block, $item) {
+    $tags = array();
+    foreach (tag::item_tags($item) as $tag) {
+      $tags[] = "<a href=\"" . url::site("tag/{$tag->name}") . "\">{$tag->name}</a>";
+    }
+    if ($tags) {
+      $info = $block->content->metadata;
+      $info["tags"] = array(
+        "label" => t("Tags:"),
+        "value" => implode(", ", $tags)
+      );
+      $block->content->metadata = $info;
+    }
+  }
 }