Ticket #42548: 42548.3.diff

src/wp-includes/media.php

@@ -1666 +1666 @@
         $atts = shortcode_atts( array(
                 'order'      => 'ASC',
                 'orderby'    => 'menu_order ID',
-                'id'         => $post ? $post->ID : 0,
+                'id'         => null,
                 'itemtag'    => $html5 ? 'figure'     : 'dl',
                 'icontag'    => $html5 ? 'div'        : 'dt',
                 'captiontag' => $html5 ? 'figcaption' : 'dd',
@@ -1677 +1677 @@
                 'link'       => ''
         ), $attr, 'gallery' );
 
-        $id = intval( $atts['id'] );
+        if ( null !== $atts['id'] ) {
+                $id = intval( $atts['id'] );
+        } else {
+                $id = $post ? intval( $post->ID ) : null;
+        }
 
         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'] ) );
@@ -1686 +1690 @@
                 foreach ( $_attachments as $key => $val ) {
                         $attachments[$val->ID] = $_attachments[$key];
                 }
-        } elseif ( ! empty( $atts['exclude'] ) ) {
-                $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
-        } else {
-                $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+        } elseif ( null !== $id ) {
+                if ( ! empty( $atts['exclude'] ) ) {
+                        $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+                } else {
+                        $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+                }
         }
 
         if ( empty( $attachments ) ) {

src/wp-includes/widgets/class-wp-widget-custom-html.php

@@ -85 +85 @@
          *
          * @since 4.8.1
          *
+         * @global WP_Post $post
          * @param array $args     Display arguments including 'before_title', 'after_title',
          *                        'before_widget', and 'after_widget'.
          * @param array $instance Settings for the current Custom HTML widget instance.
          */
         public function widget( $args, $instance ) {
+                global $post;
+
+                // Override global $post so filters (and shortcodes) apply in a consistent context.
+                $original_post = $post;
+                if ( is_singular() ) {
+                        // Make sure post is always the queried object on singular queries (not from another sub-query that failed to clean up the global $post).
+                        $post = get_queried_object();
+                } else {
+                        // Nullify the $post global during widget rendering to prevent shortcodes from running with the unexpected context on archive queries.
+                        $post = null;
+                }
 
                 $instance = array_merge( $this->default_instance, $instance );
 
@@ -118 +130 @@
                  */
                 $content = apply_filters( 'widget_custom_html_content', $content, $instance, $this );
 
+                // Restore post global.
+                $post = $original_post;
+
                 // Inject the Text widget's container class name alongside this widget's class name for theme styling compatibility.
                 $args['before_widget'] = preg_replace( '/(?<=\sclass=["\'])/', 'widget_text ', $args['before_widget'] );
 

src/wp-includes/widgets/class-wp-widget-text.php

@@ -221 +221 @@
                         remove_filter( 'widget_text', 'do_shortcode', $widget_text_do_shortcode_priority );
                 }
 
-                // Nullify the $post global during widget rendering to prevent shortcodes from running with the unexpected context.
-                $suspended_post = null;
-                if ( isset( $post ) ) {
-                        $suspended_post = $post;
+                // Override global $post so filters (and shortcodes) apply in a consistent context.
+                $original_post = $post;
+                if ( is_singular() ) {
+                        // Make sure post is always the queried object on singular queries (not from another sub-query that failed to clean up the global $post).
+                        $post = get_queried_object();
+                } else {
+                        // Nullify the $post global during widget rendering to prevent shortcodes from running with the unexpected context on archive queries.
                         $post = null;
                 }
 
@@ -278 +281 @@
                 }
 
                 // Restore post global.
-                if ( isset( $suspended_post ) ) {
-                        $post = $suspended_post;
-                }
+                $post = $original_post;
 
                 // Undo suspension of legacy plugin-supplied shortcode handling.
                 if ( $should_suspend_legacy_shortcode_support ) {