Ticket #52055: 52055.2.patch

src/wp-includes/media.php

@@ -2256 +2256 @@
                 $attr['include'] = $attr['ids'];
         }
 
-        /**
-         * Filters the default gallery shortcode output.
-         *
-         * If the filtered output isn't empty, it will be used instead of generating
-         * the default gallery template.
-         *
-         * @since 2.5.0
-         * @since 4.2.0 The `$instance` parameter was added.
-         *
-         * @see gallery_shortcode()
-         *
-         * @param string $output   The gallery output. Default empty.
-         * @param array  $attr     Attributes of the gallery shortcode.
-         * @param int    $instance Unique numeric ID of this gallery shortcode instance.
-         */
-        $output = apply_filters( 'post_gallery', '', $attr, $instance );
-
-        if ( ! empty( $output ) ) {
-                return $output;
-        }
-
         $html5 = current_theme_supports( 'html5', 'gallery' );
         $atts  = shortcode_atts(
                 array(
@@ -2296 +2275 @@
                 'gallery'
         );
 
+        /**
+         * Filters the shortcode attributes.
+         *
+         * @since 5.7.0
+         *
+         * @see gallery_shortcode()
+         *
+         * @param array  $atts     Merged attributes of the gallery shortcode.
+         * @param array  $attr     User attributes of the gallery shortcode.
+         * @param int    $instance Unique numeric ID of this gallery shortcode instance.
+         */
+        $atts = apply_filters( 'post_gallery_attributes', $atts, $attr, $instance );
+
+        /**
+         * Filters the default gallery shortcode output.
+         *
+         * If the filtered output isn't empty, it will be used instead of generating
+         * the default gallery template.
+         *
+         * @since 2.5.0
+         * @since 4.2.0 The `$instance` parameter was added.
+         * @since 5.7.0 The `$atts` parameter was added.
+         *
+         * @see gallery_shortcode()
+         *
+         * @param string $output   The gallery output. Default empty.
+         * @param array  $attr     User attributes of the gallery shortcode.
+         * @param int    $instance Unique numeric ID of this gallery shortcode instance.
+         * @param array  $atts     Merged attributes of the gallery shortcode.
+         */
+        $output = apply_filters( 'post_gallery', '', $attr, $instance, $atts );
+
+        if ( ! empty( $output ) ) {
+                return $output;
+        }
+
         $id = (int) $atts['id'];
 
         if ( ! empty( $atts['include'] ) ) {