Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

2 files changed, 6 insertions, 4 deletions

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 7a64f7ab..77b5f20a 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -87,7 +87,6 @@ class Admin_Tags_Controller extends Admin_Controller {
       $old_name = $tag->name;
       $new_name_or_list = $in_place_edit->value();
       $tag_list = explode(",", $new_name_or_list);
-      $tag_count = count($tag_list);
 
       $tag->name = array_shift($tag_list);
       $tag->save();
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 13e253ba..bb79e707 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -75,8 +75,12 @@ class Tag_Model_Core extends ORM {
       ->where("id", "!=", $this->id)
       ->find();
     if ($duplicate_tag->loaded()) {
-      // If so, tag its items with this tag so as to merge it.
-      foreach ($duplicate_tag->items() as $item) {
+      // If so, tag its items with this tag so as to merge it
+      $duplicate_tag_items = ORM::factory("item")
+        ->join("items_tags", "items.id", "items_tags.item_id")
+        ->where("items_tags.tag_id", "=", $duplicate_tag->id)
+        ->find_all();
+      foreach ($duplicate_tag_items as $item) {
         $this->add($item);
       }
 
@@ -84,7 +88,6 @@ class Tag_Model_Core extends ORM {
       $duplicate_tag->delete();
     }
 
-    // Figure out what items have changed in this tag for our item_related_update event below
     if (isset($this->object_relations["items"])) {
       $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
       $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);