Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 55 insertions, 3 deletions

diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 7a85dbab..d9488e1c 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -44,10 +44,62 @@ class Tag_Model extends ORM {
    * @return integer
    */
   public function items_count($type=null) {
-    return ORM::factory("item")
+    $model = ORM::factory("item")
       ->viewable()
       ->join("items_tags", "items.id", "items_tags.item_id")
-      ->where("items_tags.tag_id", $this->id)
-      ->count_all();
+      ->where("items_tags.tag_id", $this->id);
+
+    if ($type) {
+      $model->where("items.type", $type);
+    }
+    return $model->count_all();
+  }
+
+  /**
+   * Overload ORM::save() to trigger an item_related_update event for all items that are related
+   * to this tag.  Since items can be added or removed as part of the save, we need to trigger an
+   * event for the union of all related items before and after the save.
+   */
+  public function save() {
+    $db = Database::instance();
+    $related_item_ids = array();
+    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+      $related_item_ids[$row->item_id] = 1;
+    }
+
+    $result = parent::save();
+
+    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+      $related_item_ids[$row->item_id] = 1;
+    }
+
+    if ($related_item_ids) {
+      foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+        module::event("item_related_update", $item);
+      }
+    }
+
+    return $result;
+  }
+
+  /**
+   * Overload ORM::delete() to trigger an item_related_update event for all items that are
+   * related to this tag.
+   */
+  public function delete() {
+    $related_item_ids = array();
+    $db = Database::Instance();
+    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+      $related_item_ids[$row->item_id] = 1;
+    }
+
+    $result = parent::delete();
+
+    if ($related_item_ids) {
+      foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+        module::event("item_related_update", $item);
+      }
+    }
+    return $result;
   }
 }
\ No newline at end of file