1 files changed, 1 insertions, 52 deletions
diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc
index c3ac1d561..10d385da7 100644
--- a/modules/image/image.field.inc
+++ b/modules/image/image.field.inc
@@ -208,18 +208,6 @@ function image_field_prepare_view($entity_type, $entities, $field, $instances, $
  */
 function image_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_presave($entity_type, $entity, $field, $instance, $langcode, $items);
-
-  // Determine the dimensions if necessary.
-  foreach ($items as &$item) {
-    if (!isset($item['width']) || !isset($item['height'])) {
-      $info = image_get_info(file_load($item['fid'])->uri);
-
-      if (is_array($info)) {
-        $item['width'] = $info['width'];
-        $item['height'] = $info['height'];
-      }
-    }
-  }
 }
 
 /**
@@ -358,42 +346,9 @@ function image_field_widget_process($element, &$form_state, $form) {
 
   // Add the image preview.
   if ($element['#file'] && $widget_settings['preview_image_style']) {
-    $variables = array(
-      'style_name' => $widget_settings['preview_image_style'],
-      'path' => $element['#file']->uri,
-    );
-
-    // Determine image dimensions.
-    if (isset($element['#value']['width']) && isset($element['#value']['height'])) {
-      $variables['width'] = $element['#value']['width'];
-      $variables['height'] = $element['#value']['height'];
-    }
-    else {
-      $info = image_get_info($element['#file']->uri);
-
-      if (is_array($info)) {
-        $variables['width'] = $info['width'];
-        $variables['height'] = $info['height'];
-      }
-      else {
-        $variables['width'] = $variables['height'] = NULL;
-      }
-    }
-
     $element['preview'] = array(
       '#type' => 'markup',
-      '#markup' => theme('image_style', $variables),
-    );
-
-    // Store the dimensions in the form so the file doesn't have to be accessed
-    // again. This is important for remote files.
-    $element['width'] = array(
-      '#type' => 'hidden',
-      '#value' => $variables['width'],
-    );
-    $element['height'] = array(
-      '#type' => 'hidden',
-      '#value' => $variables['height'],
+      '#markup' => theme('image_style', array('style_name' => $widget_settings['preview_image_style'], 'path' => $element['#file']->uri)),
     );
   }
 
@@ -579,12 +534,6 @@ function theme_image_formatter($variables) {
     'path' => $item['uri'],
     'alt' => $item['alt'],
   );
-
-  if (isset($item['width']) && isset($item['height'])) {
-    $image['width'] = $item['width'];
-    $image['height'] = $item['height'];
-  }
-
   // Do not output an empty 'title' attribute.
   if (drupal_strlen($item['title']) > 0) {
     $image['title'] = $item['title'];