From cab63895c24a9b4c9765c983e9b573f65e3a1c1e Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Thu, 21 Nov 2013 20:47:07 +0100 Subject: [PATCH] Fixed "tag already exists" when only changing case --- src/Controllers/TagController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php index ab0458c1..b9216b01 100644 --- a/src/Controllers/TagController.php +++ b/src/Controllers/TagController.php @@ -91,14 +91,15 @@ class TagController { $suppliedSourceTag = InputHelper::get('source-tag'); $suppliedSourceTag = Model_Tag::validateTag($suppliedSourceTag); + $sourceTag = Model_Tag::locate($suppliedSourceTag); $suppliedTargetTag = InputHelper::get('target-tag'); $suppliedTargetTag = Model_Tag::validateTag($suppliedTargetTag); $targetTag = Model_Tag::locate($suppliedTargetTag, false); - if ($targetTag) + + if ($targetTag and $targetTag->id != $sourceTag->id) throw new SimpleException('Target tag already exists'); - $sourceTag = Model_Tag::locate($suppliedSourceTag); $sourceTag->name = $suppliedTargetTag; R::store($sourceTag);