2 files changed, 22 insertions, 13 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 73042a55..7a64f7ab 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -81,17 +81,26 @@ class Admin_Tags_Controller extends Admin_Controller {
 
     $in_place_edit = InPlaceEdit::factory($tag->name)
       ->action("admin/tags/rename/$tag->id")
-      ->rules(array("required", "length[1,64]"))
-      ->messages(array("in_use" => t("There is already a tag with that name")))
-      ->callback(array($this, "check_for_duplicate"));
+      ->rules(array("required", "length[1,64]"));
 
     if ($in_place_edit->validate()) {
       $old_name = $tag->name;
-      $tag->name = $in_place_edit->value();
+      $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();
 
-      $message = t("Renamed tag <b>%old_name</b> to <b>%new_name</b>",
-                   array("old_name" => $old_name, "new_name" => $tag->name));
+      if (!empty($tag_list)) {
+        $this->_copy_items_for_tags($tag, $tag_list);
+        $message = t("Split tag <i>%old_name</i> into <i>%tag_list</i>",
+                     array("old_name" => $old_name, "tag_list" => $new_name_or_list));
+      } else {
+        $message = t("Renamed tag <i>%old_name</i> to <i>%new_name</i>",
+                     array("old_name" => $old_name, "new_name" => $tag->name));
+      }
+
       message::success($message);
       log::success("tags", $message);
 
@@ -101,12 +110,11 @@ class Admin_Tags_Controller extends Admin_Controller {
     }
   }
 
-  public function check_for_duplicate(Validation $post_data, $field) {
-    $tag_exists = ORM::factory("tag")->where("name", "=", $post_data[$field])->count_all();
-    if ($tag_exists) {
-      $post_data->add_error($field, "in_use");
+  private function _copy_items_for_tags($tag, $tag_list) {
+    foreach ($tag->items() as $item) {
+      foreach ($tag_list as $new_tag_name) {
+        tag::add($item, trim($new_tag_name));
+      }
     }
   }
-
 }
-
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index fe6d747b..bf41c4df 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -22,7 +22,8 @@ class Tags_Controller extends Controller {
     // Far from perfection, but at least require view permission for the root album
     $album = ORM::factory("item", 1);
     access::required("view", $album);
-    print tag::cloud(30);
+
+    print tag::cloud(module::get_var("tag", "tag_cloud_size", 30));
   }
 
   public function create($item_id) {