? e_strict.patch
? e_strict2.patch
Index: properties.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/properties/properties.test,v
retrieving revision 1.1
diff -u -p -r1.1 properties.test
--- properties.test	22 Dec 2010 19:55:20 -0000	1.1
+++ properties.test	2 Jan 2011 13:03:03 -0000
@@ -252,7 +252,8 @@ class PropertiesBaseTestCase extends Dru
 
     // Get node id and return it.
     if (preg_match('|node/([0-9]+)|', $this->getUrl(), $match)) {
-      return reset(entity_load($entity, array($match[1])));
+      $entity = entity_load($entity, array($match[1]));
+      return reset($entity);
     }
   }
 }
Index: properties_compare/properties_compare.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/properties/properties_compare/properties_compare.module,v
retrieving revision 1.1
diff -u -p -r1.1 properties_compare.module
--- properties_compare/properties_compare.module	22 Dec 2010 19:55:20 -0000	1.1
+++ properties_compare/properties_compare.module	2 Jan 2011 13:03:03 -0000
@@ -262,7 +262,8 @@ function properties_compare_list_form($f
   $first = NULL;
   $noncomparable = FALSE;
   foreach ($list as $compare_item) {
-    $entity = reset(entity_load($compare_item['entity_type'], array($compare_item['entity_id'])));
+    $entity = entity_load($compare_item['entity_type'], array($compare_item['entity_id']));
+    $entity = reset($entity);
     if (!$entity) {
       // Entity could not be loaded, ignore and remove from list.
       properties_compare_list_delete($compare_item['entity_type'], $compare_item['entity_id']);
Index: properties_compare/properties_compare.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/properties/properties_compare/properties_compare.pages.inc,v
retrieving revision 1.1
diff -u -p -r1.1 properties_compare.pages.inc
--- properties_compare/properties_compare.pages.inc	22 Dec 2010 19:55:20 -0000	1.1
+++ properties_compare/properties_compare.pages.inc	2 Jan 2011 13:03:03 -0000
@@ -24,7 +24,8 @@ function properties_compare_page() {
   $first = array();
   // First, loop over compare items to collect categories and attributes.
   foreach ($list as $key => $item) {
-    $entity = reset(entity_load($item['entity_type'], array($item['entity_id'])));
+    $entity = entity_load($item['entity_type'], array($item['entity_id']));
+    $entity = reset($entity);
     if (!$first) {
       $first = $item + array('entity' => $entity);
     }
Index: properties_sql/properties_sql.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/properties/properties_sql/properties_sql.module,v
retrieving revision 1.1
diff -u -p -r1.1 properties_sql.module
--- properties_sql/properties_sql.module	22 Dec 2010 19:55:20 -0000	1.1
+++ properties_sql/properties_sql.module	2 Jan 2011 13:03:03 -0000
@@ -36,7 +36,8 @@ function properties_sql_properties_attri
  *   Machine readable name of the attribute.
  */
 function properties_sql_properties_attribute_load($name) {
-  return reset(properties_sql_properties_attribute_load_multiple(array($name)));
+  $attributes = properties_sql_properties_attribute_load_multiple(array($name));
+  return reset($attributes);
 }
 
 /**
@@ -137,7 +138,8 @@ function properties_sql_properties_categ
  *   Machine readable name of the category.
  */
 function properties_sql_properties_category_load($name) {
-  return reset(properties_sql_properties_category_load_multiple(array($name)));
+  $categories = properties_sql_properties_category_load_multiple(array($name));
+  return reset($categories);
 }
 
 /**
@@ -260,7 +262,8 @@ function properties_sql_properties_templ
  *   Machine readable name of the template.
  */
 function properties_sql_properties_template_load($name) {
-  return reset(properties_sql_properties_template_load_multiple(array($name)));
+  $templates = properties_sql_properties_template_load_multiple(array($name));
+  return reset($templates);
 }
 
 
Index: properties_template/properties_template.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/properties/properties_template/properties_template.admin.inc,v
retrieving revision 1.1
diff -u -p -r1.1 properties_template.admin.inc
--- properties_template/properties_template.admin.inc	22 Dec 2010 19:55:20 -0000	1.1
+++ properties_template/properties_template.admin.inc	2 Jan 2011 13:03:03 -0000
@@ -56,9 +56,8 @@ function properties_template_admin_templ
       $field_name = $_GET['field_name'];
 
       if (entity_get_info($entity_type) && field_info_field($field_name)) {
-
-        $entity = reset(entity_load($entity_type, array($entity_id)));
-
+        $entity = entity_load($entity_type, array($entity_id));
+        $entity = reset($entity);
         if ($entity && isset($entity->{$field_name})) {
           $langcode = field_language($entity_type, $entity, $field_name);