From 875be24cfd69d1a22d6a951884625c74ee0b5e59 Tue, 10 Jan 2012 00:00:34 +0100
From: Bram Goffings <bramgoffings@gmail.com>
Date: Tue, 10 Jan 2012 00:00:27 +0100
Subject: [PATCH] entity patch



diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index 2241371..ac3629d 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -35,12 +35,12 @@
 /**
  * Gets the entity info array of an entity type.
  *
- * @see hook_entity_info()
- * @see hook_entity_info_alter()
- *
  * @param $entity_type
  *   The entity type, e.g. node, for which the info shall be returned, or NULL
  *   to return an array with info about all types.
+ *
+ * @see hook_entity_info()
+ * @see hook_entity_info_alter()
  */
 function entity_get_info($entity_type = NULL) {
   global $language;
@@ -122,12 +122,13 @@
 }
 
 /**
- * Helper function to extract id, vid, and bundle name from an entity.
+ * Extracts id, vid, and bundle name from an entity.
  *
  * @param $entity_type
  *   The entity type; e.g. 'node' or 'user'.
  * @param $entity
  *   The entity from which to extract values.
+ *
  * @return
  *   A numerically indexed array (not a hash table) containing these
  *   elements:
@@ -159,7 +160,7 @@
 }
 
 /**
- * Helper function to assemble an object structure with initial ids.
+ * Assembles an object structure with initial ids.
  *
  * This function can be seen as reciprocal to entity_extract_ids().
  *
@@ -205,11 +206,6 @@
  * DrupalDefaultEntityController class. See node_entity_info() and the
  * NodeController in node.module as an example.
  *
- * @see hook_entity_info()
- * @see DrupalEntityControllerInterface
- * @see DrupalDefaultEntityController
- * @see EntityFieldQuery
- *
  * @param $entity_type
  *   The entity type to load, e.g. node or user.
  * @param $ids
@@ -226,6 +222,11 @@
  *   An array of entity objects indexed by their ids.
  *
  * @todo Remove $conditions in Drupal 8.
+ *
+ * @see hook_entity_info()
+ * @see DrupalEntityControllerInterface
+ * @see DrupalDefaultEntityController
+ * @see EntityFieldQuery
  */
 function entity_load($entity_type, $ids = FALSE, $conditions = array(), $reset = FALSE) {
   if ($reset) {
@@ -313,12 +314,12 @@
  * field_attach_prepare_view() to allow entity level hooks to act on content
  * loaded by field API.
  *
- * @see hook_entity_prepare_view()
- *
  * @param $entity_type
  *   The type of entity, i.e. 'node', 'user'.
  * @param $entities
  *   The entity objects which are being prepared for view, keyed by object ID.
+ *
+ * @see hook_entity_prepare_view()
  */
 function entity_prepare_view($entity_type, $entities) {
   // To ensure hooks are only run once per entity, check for an
@@ -414,7 +415,7 @@
 }
 
 /**
- * Helper function for attaching field API validation to entity forms.
+ * Attaches field API validation to entity forms.
  */
 function entity_form_field_validate($entity_type, $form, &$form_state) {
   // All field attach API functions act on an entity object, but during form
@@ -427,7 +428,7 @@
 }
 
 /**
- * Helper function for copying submitted values to entity properties for simple entity forms.
+ * Copies submitted values to entity properties for simple entity forms.
  *
  * During the submission handling of an entity form's "Save", "Preview", and
  * possibly other buttons, the form state's entity needs to be updated with the
diff --git a/core/modules/entity/entity.query.inc b/core/modules/entity/entity.query.inc
index b4e91a2..0482e9b 100644
--- a/core/modules/entity/entity.query.inc
+++ b/core/modules/entity/entity.query.inc
@@ -43,6 +43,7 @@
  * other storage engines might not do this.
  */
 class EntityFieldQuery {
+
   /**
    * Indicates that both deleted and non-deleted fields should be returned.
    *