From 88304774a9692d3d8bf59cd7f95ee88edd31a74c Mon Sep 17 00:00:00 2001
From: Adam Vessey <adam-vessey@users.noreply.github.com>
Date: Mon, 26 Jan 2015 17:20:34 -0400
Subject: [PATCH] Revert "Allow "islandora_object" entities to be loaded."

This reverts commit 598e68980e66f95d2a659e3aa64df876c776ccfc.
---
 includes/object.entity_controller.inc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/includes/object.entity_controller.inc b/includes/object.entity_controller.inc
index dfd2d2fd..87b5e4de 100644
--- a/includes/object.entity_controller.inc
+++ b/includes/object.entity_controller.inc
@@ -29,13 +29,9 @@ class IslandoraObjectEntityController implements DrupalEntityControllerInterface
    *   An array of loaded objects.
    */
   public function load($ids = array(), $conditions = array()) {
-    if (isset($conditions['id'])) {
-      // Allow loading by specifying the ID as a property as a work-around,
-      // since some components dealing with entities expect IDs to be numeric.
-      $ids = array_merge($ids, (array) $conditions['id']);
-    }
-    elseif (!empty($conditions)) {
-      throw new Exception('Conditions other than "id" not implemented.');
+    if (!empty($conditions)) {
+      // TODO: Allow loading by specifying IDs in the condition.
+      throw new Exception('Conditions not implemented.');
     }
 
     $loaded = array();