[gh-217] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1014 20a16fea-79d4-4915-8869-1ea9d5ebf173

README-UNL.txt

@@ -16,3 +16,8 @@ rewrite.php
 used to allow public files to be accessed without the sites/<site_dir>/files prefix
 
 ------------------------------------
+
+modules/image/image.field.inc
+ * theme_image_formatter ignores attributes so classes can't be added to an image in a theme (needed for photo frame)
+ * http://drupal.org/node/1025796#comment-4298698
+ * http://drupal.org/files/issues/1025796.patch
\ No newline at end of file

modules/image/image.field.inc

@@ -539,6 +539,12 @@ function theme_image_formatter($variables) {
     $image['title'] = $item['title'];
   }
 
+  /* UNL change: patch http://drupal.org/files/issues/1025796.patch http://drupal.org/node/1025796#comment-4298698 */
+  // Load the attributes into the image.
+  if (isset($item['attributes'])) {
+    $image['attributes'] = $item['attributes'];
+  }
+
   if ($variables['image_style']) {
     $image['style_name'] = $variables['image_style'];
     $output = theme('image_style', $image);