From ffdfc3e150087bfcec3a1b5f370b1ba85e20b597 Mon Sep 17 00:00:00 2001
From: Sofian Benaissa <sofian@koumbit.org>
Date: Wed, 11 Apr 2012 09:15:55 -0400
Subject: [PATCH] Fix fatal errors when entity_load is called with no ids

---
 includes/commerce.controller.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/includes/commerce.controller.inc b/includes/commerce.controller.inc
index 5605f67..b695922 100644
--- a/includes/commerce.controller.inc
+++ b/includes/commerce.controller.inc
@@ -40,7 +40,9 @@ class DrupalCommerceEntityController extends DrupalDefaultEntityController imple
 
       // Store the ids of the entities in the lockedEntities array for later
       // tracking, flipped for easier management via unset() below.
-      $this->lockedEntities += array_flip($ids);
+      if (is_array($ids)) {
+        $this->lockedEntities += array_flip($ids);
+      }
     }
 
     return $query;
-- 
1.7.2.5