Index: entity/entity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/entity/Attic/entity.module,v
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.29 entity.module
--- entity/entity.module	25 Nov 2010 16:54:28 -0000	1.1.2.29
+++ entity/entity.module	26 Nov 2010 00:19:44 -0000
@@ -265,19 +265,24 @@ function entity_view($entity_type, $enti
  * @param $entity_type
  *   The entity type of the entity to check for.
  * @param $entity
- *   Optionally an entity to check access for. If no entity is given, it will be
- *   determined whether access is allowed for all entities of the given type.
+ *   (optional) An entity to check access for. If omitted, access for the
+ *   operation is checked for all entities of the given type.
  * @param $account
- *   The user to check for. Leave it to NULL to check for the global user.
+ *   (optional) The user account to check access for. Defaults to NULL (the
+ *   currently logged in user).
  *
  * @return boolean
  *   Whether access is allowed or not. If the entity type does not specify any
- *   access information, NULL is returned.
+ *   access information, TRUE is returned.
  */
 function entity_access($op, $entity_type, $entity = NULL, $account = NULL) {
-  if (($info = entity_get_info()) && isset($info[$entity_type]['access callback'])) {
-    return $info[$entity_type]['access callback']($op, $entity, $account, $entity_type);
+  $info = entity_get_info($entity_type);
+  if (isset($info['access callback'])) {
+    return $info['access callback']($op, $entity, $account, $entity_type);
   }
+  // If the entity does not implement an access callback, then access is
+  // unrestricted.
+  return TRUE;
 }
 
 /**
Index: entity/entity.ui.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/entity/Attic/entity.ui.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 entity.ui.inc
--- entity/entity.ui.inc	25 Nov 2010 16:54:28 -0000	1.1.2.12
+++ entity/entity.ui.inc	26 Nov 2010 00:02:25 -0000
@@ -82,7 +82,7 @@ class EntityDefaultUIController {
       'file' => 'entity.ui.inc',
     );
 
-    if ($this->entityInfo['exportable']) {
+    if (!empty($this->entityInfo['exportable'])) {
       // Menu item for importing an entity.
       $items[$this->path . '/import'] = array(
         'title callback' => 'entity_ui_get_action_title',