Fixing to save tag with identifier.

CakeDC · Apr 18, 2014 · b378ddd · b378ddd
1 parent d4c4e9e
commit b378ddd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Model/Behavior/TaggableBehavior.php b/Model/Behavior/TaggableBehavior.php
@@ -167,10 +167,15 @@ public function saveTags(Model $model, $string = null, $foreignKey = null, $upda
 			extract($this->disassembleTags($model, $string, $this->settings[$model->alias]['separator']));
 
 			if (!empty($tags)) {
+				$conditions = array('OR' => array_map(function ($tag) use ($tagModel) {
+					return array(
+						$tagModel->alias . '.identifier' => $tag['identifier'],
+						$tagModel->alias . '.keyname' => $tag['keyname'],
+					);
+				}, $tags));
 				$existingTags = $tagModel->find('all', array(
 					'contain' => array(),
-					'conditions' => array(
-						$tagModel->alias . '.keyname' => Set::extract($tags, '{n}.keyname')),
+					'conditions' => $conditions,
 					'fields' => array(
 						$tagModel->alias . '.identifier',
 						$tagModel->alias . '.keyname',