From 87bc8515616548dddda424f7b520200d4da7e81d Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 2 Apr 2014 21:49:38 +0000
Subject: [PATCH] Remove <br> elements for HTML5 galleries.

props obenland.
fixes #27637, see #26697.


git-svn-id: https://develop.svn.wordpress.org/trunk@27914 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/media.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index ad2e7e61ec..1026e9d0de 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -992,11 +992,12 @@ function gallery_shortcode( $attr ) {
 				</{$captiontag}>";
 		}
 		$output .= "</{$itemtag}>";
-		if ( $columns > 0 && ++$i % $columns == 0 )
+		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0 ) {
 			$output .= '<br style="clear: both" />';
+		}
 	}
 
-	if ( $columns > 0 && $i % $columns !== 0 ) {
+	if ( ! $html5 && $columns > 0 && $i % $columns !== 0 ) {
 		$output .= "
 			<br style='clear: both' />";
 	}