Commit e7209241 authored by tim.plunkett's avatar tim.plunkett
Browse files

Issue #1744152 by tim.plunkett: Fixed entity_load_multiple() no longer supports $conditions.

parent 03b8d46d
......@@ -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;
}
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment