Changeset 27396

Timestamp:

03/04/2014 06:52:34 PM (11 years ago)

Author:

nacin

Message:

Do not output default gallery styles if the theme has opted into HTML5 galleries.

fixes #27045. see #26697.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -876 +876 @@
 
     $gallery_style = $gallery_div = '';
-    if ( apply_filters( 'use_default_gallery_style', true ) )
+
+    /**
+     * Filter whether to print default gallery styles.
+     *
+     * @since 3.1.0
+     *
+     * @param bool $print Whether to print default gallery styles.
+     *                    Defaults to false if the theme supports HTML5 galleries.
+     *                    Otherwise, defaults to true.
+     */
+    if ( apply_filters( 'use_default_gallery_style', ! $html5 ) ) {
         $gallery_style = "
         <style type='text/css'>
@@ -895 +905 @@
             }
             /* see gallery_shortcode() in wp-includes/media.php */
-        </style>";
+        </style>\n\t\t";
+    }
+
     $size_class = sanitize_html_class( $size );
     $gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
-    $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );
+    $output = apply_filters( 'gallery_style', $gallery_style . $gallery_div );
 
     $i = 0;