commit 86aa5db0c677683531cdd9ce99c4277cd83dc882 Author: fago Date: Thu Jun 16 11:27:35 2011 +0200 ids diff --git a/includes/rules.core.inc b/includes/rules.core.inc index a5f1155..f4665bf 100644 --- a/includes/rules.core.inc +++ b/includes/rules.core.inc @@ -8,7 +8,7 @@ /** * Make sure loaded rule configs are instantiated right. */ -class RulesEntityController extends EntityAPIController { +class RulesEntityController extends EntityAPIControllerExportable { /** * Overriden. @@ -24,7 +24,7 @@ class RulesEntityController extends EntityAPIController { $entity->$field = $record->$field; } unset($entity->data, $entity->plugin); - $entities[$entity->name] = $entity; + $entities[$entity->id] = $entity; } $queried_entities = $entities; parent::attachLoad($queried_entities, $revision_id); diff --git a/rules.module b/rules.module index 126908d..ddde229 100644 --- a/rules.module +++ b/rules.module @@ -601,7 +601,7 @@ function rules_hook_info() { * An array of rule configurations indexed by their ids. */ function rules_config_load_multiple($names = array(), $conditions = array()) { - return entity_get_controller('rules_config')->load($names, $conditions); + return entity_load_multiple_by_name('rules_config', $names, $conditions); } /** @@ -612,8 +612,7 @@ function rules_config_load_multiple($names = array(), $conditions = array()) { * @return RulesPlugin */ function rules_config_load($name) { - $result = entity_get_controller('rules_config')->load(array($name)); - return reset($result); + return entity_load_single('rules_config', $name); } /**