metatags_quick.module |   47 ++++++++++++++++++++++-------------------------
 1 files changed, 22 insertions(+), 25 deletions(-)

diff --git metatags_quick.module metatags_quick.module
index cafe7af..f0ceeef 100644
--- metatags_quick.module
+++ metatags_quick.module
@@ -4,8 +4,8 @@
  * Module defines new field type 'meta'.
  * Fields of this type are not displayed in HTML.
  * Instead, they add html meta to the head section.
- * 
- * @author Valery L. Lourie 
+ *
+ * @author Valery L. Lourie
  */
 
 /**
@@ -33,14 +33,14 @@ function metatags_quick_field_info() {
 function metatags_quick_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
   foreach ($items as $lang => $lang_item) {
     foreach ($lang_item as $i => $final_item) {
-      $items[$lang][$i]['meta_name'] = $field['settings']['meta_name'];  
+      $items[$lang][$i]['meta_name'] = $field['settings']['meta_name'];
     }
   }
 }
 
 /**
  * Implements hook_entity_load.
- * 
+ *
  * Add html meta on entity load.
  * @see http://api.drupal.org/api/drupal/modules--system--system.api.php/function/hook_entity_load/7
  */
@@ -64,24 +64,21 @@ function metatags_quick_entity_load($entities, $type) {
 
   foreach ($entities as $entity) {
     foreach ($fields[$type] as $key) {
-      if (isset($entity->$key)) {
-        foreach ($entity->$key as $lang => $lang_fields) {
-          foreach ($lang_fields as $lang_field) {
-            if (isset($meta_added[$lang][$lang_field['meta_name']])) {
-              return;
-            }
-            else {
-              $element = array(
-                '#tag' => 'meta',
-                '#attributes' => array(
-                  'name' => $lang_field['meta_name'],
-                  'content' => $lang_field['metatags_quick'],
-                ),
-              );
-              drupal_add_html_head($element, 'metatags_quick_' . $lang_field['meta_name']);
-              $meta_added[$lang][$lang_field['meta_name']] = TRUE;
-            }
-          }
+      $items = field_get_items($type, $entity, $key);
+      foreach ($items as $item) {
+        if (isset($meta_added[$item['meta_name']])) {
+          return;
+        }
+        else {
+          $element = array(
+            '#tag' => 'meta',
+            '#attributes' => array(
+              'name' => $item['meta_name'],
+              'content' => $item['metatags_quick'],
+            ),
+          );
+          drupal_add_html_head($element, 'metatags_quick_' . $item['meta_name']);
+          $meta_added[$item['meta_name']] = TRUE;
         }
       }
     }
@@ -97,7 +94,7 @@ function metatags_quick_field_validate($obj_type, $object, $field, $instance, $l
     if (!empty($item['metatags_quick']) && strlen($item['metatags_quick']) > 255) {
       $error = t('%name: the value may not be longer than %max characters.', array('%name' => $instance['label'], '%max' => 255));
       $errors[$field['field_name']][$langcode][$delta][] = array(
-        'error' => $error, 
+        'error' => $error,
         'message' => $error,
       );
     }
@@ -169,10 +166,10 @@ function metatags_quick_field_widget_info() {
  */
 function metatags_quick_field_settings_form($field, $instance) {
   $settings = $field['settings'];
-  
+
   if (empty($settings['meta_name'])) {
     preg_match('/field_(.*)/', $instance['field_name'], $matches);
-    $settings['meta_name'] = $matches[1]; 
+    $settings['meta_name'] = $matches[1];
   }
 
   $form['meta_name'] = array(