commit 5b750ee26ae742b9ca0f94df7eb49bbe1abad4ad
Author: Shane Auckland <shane.auckland@gmail.com>
Date:   Fri Apr 19 16:42:05 2013 +0100

    1939068-52

diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php
index e17326a..e7552d2 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php
@@ -70,7 +70,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="120" height="60" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="120" height="60" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -91,7 +91,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="60" height="120" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="60" height="120" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -113,7 +113,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -135,7 +135,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -153,7 +153,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="45" height="90" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -174,7 +174,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -194,7 +194,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" width="30" height="30" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" width="30" height="30" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -215,7 +215,7 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" alt="" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($url);
     $this->assertResponse(200, 'Image was generated at the URL.');
@@ -233,6 +233,6 @@ function testImageDimensions() {
 
     image_effect_save($style, $effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual(trim($img_tag), '<img class="image-style-test" src="' . $url . '" alt="" />');
+    $this->assertEqual($img_tag, '<img class="image-style-test" src="' . $url . '" alt="" />');
   }
 }
diff --git a/core/modules/system/templates/image.html.twig b/core/modules/system/templates/image.html.twig
index af98ba4..7bbbfe1 100644
--- a/core/modules/system/templates/image.html.twig
+++ b/core/modules/system/templates/image.html.twig
@@ -12,4 +12,6 @@
  * @ingroup themeable
  */
 #}
-<img{{ attributes }} />
+{% spaceless %}
+  <img{{ attributes }} />
+{% endspaceless %}