From 88f57127dad5f58de3cc6999a584660254289698 Mon Sep 17 00:00:00 2001
From: Chris Leppanen <chris.leppanen@gmail.com>
Date: Tue, 9 Dec 2014 16:37:59 -0800
Subject: [PATCH] Issue #2379915 by hydrant-mark, twistor: Taxonomy Mapper:
Assumes there will only ever be one matching term
---
mappers/taxonomy.inc | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/mappers/taxonomy.inc b/mappers/taxonomy.inc
index 088a5589..1a83e0b3 100644
--- a/mappers/taxonomy.inc
+++ b/mappers/taxonomy.inc
@@ -136,7 +136,14 @@ function taxonomy_feeds_set_target($source, $entity, $target, array $terms, $map
$term = trim($term);
$name_query = clone $query;
if (strlen($term) && $tids = $name_query->propertyCondition('name', $term)->execute()) {
- $tid = key($tids['taxonomy_term']);
+
+ // Find the first allowed term.
+ foreach ($tids['taxonomy_term'] as $possible_term) {
+ if (isset($cache['allowed_values'][$target][$possible_term->tid])) {
+ $tid = $possible_term->tid;
+ break;
+ }
+ }
}
elseif ($mapping['autocreate'] && strlen($term)) {
$term = (object) array(
@@ -154,7 +161,7 @@ function taxonomy_feeds_set_target($source, $entity, $target, array $terms, $map
// Lookup by tid.
case FEEDS_TAXONOMY_SEARCH_TERM_ID:
if (is_numeric($term)) {
- $tid = $term;
+ $tid = (int) $term;
}
break;
--
GitLab