1 files changed, 7 insertions, 0 deletions
diff --git a/core/models/item.php b/core/models/item.php
index 4481a3a9..ba759c2b 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -21,6 +21,13 @@ class Item_Model extends ORM_MPTT {
   protected $children = 'items';
   protected $has_one = array("owner" => "user");
 
+  function __construct($id=null) {
+    parent::__construct($id);
+    if (!in_array("tags", $this->has_and_belongs_to_many) && module::is_installed("tag")) {
+      $this->has_and_belongs_to_many[] = "tags";
+    }
+  }
+
   /**
    * Is this item an album?
    * @return true if it's an album