Ticket #14130: 14130.2.patch

wp-includes/media.php

@@ -1580 +1580 @@
         }
 
         $html5 = current_theme_supports( 'html5', 'gallery' );
-        $atts = shortcode_atts( array(
-                'order'      => 'ASC',
-                'orderby'    => 'menu_order ID',
-                'id'         => $post ? $post->ID : 0,
-                'itemtag'    => $html5 ? 'figure'     : 'dl',
-                'icontag'    => $html5 ? 'div'        : 'dt',
-                'captiontag' => $html5 ? 'figcaption' : 'dd',
-                'columns'    => 3,
-                'size'       => 'thumbnail',
-                'include'    => '',
-                'exclude'    => '',
-                'link'       => ''
+        $atts  = shortcode_atts( array(
+                'order'           => 'ASC',
+                'orderby'         => 'menu_order ID',
+                'id'              => $post ? $post->ID : 0,
+                'itemtag'         => $html5 ? 'figure' : 'dl',
+                'icontag'         => $html5 ? 'div' : 'dt',
+                'captiontag'      => $html5 ? 'figcaption' : 'dd',
+                'columns'         => 3,
+                'container_class' => '',
+                'item_class'      => '',
+                'size'            => 'thumbnail',
+                'include'         => '',
+                'exclude'         => '',
+                'link'            => ''
         ), $attr, 'gallery' );
 
         $id = intval( $atts['id'] );
 
+        $container_class = explode( ' ', $atts['container_class'] );
+
+        if ( ! is_array( $container_class ) ) {
+                $container_class = array( $container_class );
+        }
+
+        $item_class = explode( ' ', $atts['item_class'] );
+        if ( ! is_array( $item_class ) ) {
+                $item_class = array( $item_class );
+        }
+
         if ( ! empty( $atts['include'] ) ) {
                 $_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
 
@@ -1675 +1688 @@
         }
 
         $size_class = sanitize_html_class( $atts['size'] );
-        $gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 
+        $container_class = array_merge( array(
+                'gallery',
+                'galleryid-' . $id,
+                'gallery-columns-' . $columns,
+                'gallery-size-' . $size_class
+        ), $container_class );
+
         /**
+         * Filter the container classes
+         *
+         * @since 4.5.0
+         *
+         * @param array $container_class Container Classes
+         */
+        $container_class = apply_filters( 'gallery_container_class', $container_class );
+
+        $gallery_div = "<div id='$selector' class='" . implode( ' ', array_unique( $container_class ) ) . "'>";
+
+        /**
          * Filter the default gallery shortcode CSS styles.
          *
          * @since 2.5.0
@@ -1704 +1734 @@
                 if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
                         $orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
                 }
-                $output .= "<{$itemtag} class='gallery-item'>";
+
+                $item_class = array_merge( array( 'gallery-item' ), $item_class );
+
+                /**
+                 * Filter the item classes
+                 *
+                 * @since 4.5.0
+                 *
+                 * @param array $item_class Item Classes
+                 * @param array $atts Shortcode atts
+                 * @param WP_Post $attachment Current image
+                 */
+                $item_class = apply_filters( 'gallery_item_class', $item_class, $atts, $attachment );
+
+                $output .= "<{$itemtag} class='" . implode( ' ', array_unique( $item_class ) ) . "'>";
                 $output .= "
                         <{$icontag} class='gallery-icon {$orientation}'>
                                 $image_output