From e7209241f3f77271a0e48d809457e3f2637b0dae Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Wed, 22 Aug 2012 13:43:56 +0200
Subject: [PATCH] Issue #1744152 by tim.plunkett: Fixed entity_load_multiple()
no longer supports $conditions.
---
includes/admin.inc | 2 +-
lib/Views/field/Plugin/views/field/Field.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/admin.inc b/includes/admin.inc
index f0bb5a76d250..467c5be3def9 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -785,7 +785,7 @@ function views_ui_taxonomy_autocomplete_validate($element, &$form_state) {
// Store the term ID of each (valid) tag that the user typed.
$typed_terms = drupal_explode_tags($tags);
foreach ($typed_terms as $typed_term) {
- if ($terms = taxonomy_term_load_multiple(array(), array('name' => trim($typed_term), 'vid' => array_keys($vocabularies)))) {
+ if ($terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => trim($typed_term), 'vid' => array_keys($vocabularies)))) {
$term = array_pop($terms);
$value['tids'][] = $term->tid;
}
diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
index 5839be8a8006..647784e6351d 100644
--- a/lib/Views/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -664,7 +664,7 @@ function post_execute(&$values) {
$keys = array();
foreach ($entity_ids as $key => $combined) {
list($entity_id, $revision_id) = $combined;
- $entity = entity_load_multiple($entity_type, array($entity_id), array($entity_info['entity keys']['revision'] => $revision_id));
+ $entity = entity_revision_load($entity_type, $revision_id);
if ($entity) {
$entities[$revision_id] = array_shift($entity);
$keys[$key] = $revision_id;
--
GitLab