Changeset 54545

Timestamp:

10/17/2022 05:39:34 PM (22 months ago)

Author:

audrasjb

Message:

Grouped backports to the 5.9 branch.

• Editor: Bump @wordpress packages for the 5.9 branch,
• Media: Refactor search by filename within the admin,
• REST API: Lockdown post parameter of the terms endpoint,
• Customize: Escape blogname option in underscores templates,
• Query: Validate relation in WP_Date_Query,
• Users: Revert use of shared objects for current user,
• Posts, Post types: Apply KSES to post-by-email content,
• General: Validate host on "Are you sure?" screen,
• Posts, Post types: Remove emails from post-by-email logs,
• Pings/trackbacks: Apply KSES to all trackbacks,
• Mail: Reset PHPMailer properties between use,
• Comments: Apply kses when editing comments,
• Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.9 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• package.json (modified) (4 diffs)
• src/wp-admin/includes/ajax-actions.php (modified) (1 diff)
• src/wp-admin/includes/post.php (modified) (1 diff)
• src/wp-includes/class-wp-date-query.php (modified) (3 diffs)
• src/wp-includes/class-wp-query.php (modified) (5 diffs)
• src/wp-includes/comment.php (modified) (2 diffs)
• src/wp-includes/customize/class-wp-customize-header-image-control.php (modified) (2 diffs)
• src/wp-includes/customize/class-wp-customize-site-icon-control.php (modified) (1 diff)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/media-template.php (modified) (1 diff)
• src/wp-includes/pluggable.php (modified) (3 diffs)
• src/wp-includes/post.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php (modified) (2 diffs)
• src/wp-includes/user.php (modified) (2 diffs)
• src/wp-includes/widgets.php (modified) (2 diffs)
• src/wp-mail.php (modified) (2 diffs)
• src/wp-trackback.php (modified) (1 diff)
• tests/phpunit/tests/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/query/search.php (modified) (5 diffs)
• tests/phpunit/tests/rest-api/rest-comments-controller.php (modified) (8 diffs)

branches/5.9/package.json

@@ -83 +83 @@
         "@wordpress/autop": "3.2.3",
         "@wordpress/blob": "3.2.2",
-        "@wordpress/block-directory": "3.0.29",
+        "@wordpress/block-directory": "3.0.",
         "@wordpress/block-editor": "8.0.18",
-        "@wordpress/block-library": "6.0.28",
+        "@wordpress/block-library": "6.0.2",
         "@wordpress/block-serialization-default-parser": "4.2.3",
         "@wordpress/blocks": "11.1.5",
@@ -91 +91 @@
         "@wordpress/compose": "5.0.7",
         "@wordpress/core-data": "4.0.11",
-        "@wordpress/customize-widgets": "2.0.29",
+        "@wordpress/customize-widgets": "2.0.",
         "@wordpress/data": "6.1.5",
         "@wordpress/data-controls": "2.2.9",
@@ -98 +98 @@
         "@wordpress/dom": "3.2.7",
         "@wordpress/dom-ready": "3.2.3",
-        "@wordpress/edit-post": "5.0.29",
-        "@wordpress/edit-site": "3.0.29",
-        "@wordpress/edit-widgets": "3.1.24",
+        "@wordpress/edit-post": "5.0.",
+        "@wordpress/edit-site": "3.0.",
+        "@wordpress/edit-widgets": "3.1.2",
         "@wordpress/editor": "12.0.22",
         "@wordpress/element": "4.0.4",
@@ -129 +129 @@
         "@wordpress/viewport": "4.0.7",
         "@wordpress/warning": "2.2.2",
-        "@wordpress/widgets": "2.0.24",
+        "@wordpress/widgets": "2.0.2",
         "@wordpress/wordcount": "3.2.3",
         "backbone": "1.4.0",

branches/5.9/src/wp-admin/includes/ajax-actions.php

@@ -2985 +2985 @@
     // Filter query clauses to include filenames.
     if ( isset( $query['s'] ) ) {
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
     }
 

branches/5.9/src/wp-admin/includes/post.php

@@ -1303 +1303 @@
     // Filter query clauses to include filenames.
     if ( isset( $q['s'] ) ) {
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
     }
 

branches/5.9/src/wp-includes/class-wp-date-query.php

@@ -150 +150 @@
         }
 
-        if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
-            $this->relation = 'OR';
+        if ( isset( $date_query['relation'] ) ) {
+            $this->relation = ;
         } else {
             $this->relation = 'AND';
@@ -219 +219 @@
             $this->validate_date_values( $queries );
         }
+
+
+
 
         foreach ( $queries as $key => $q ) {
@@ -1041 +1044 @@
         return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

branches/5.9/src/wp-includes/class-wp-query.php

@@ -445 +445 @@
     public $thumbnails_cached = false;
 
+
+
+
+
+
+
+
     /**
      * Cached list of search stopwords.
@@ -1415 +1422 @@
 
             $like      = $n . $wpdb->esc_like( $term ) . $n;
-            $search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+
+            if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+                $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
+            } else {
+                $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+            }
             $searchand = ' AND ';
         }
@@ -1810 +1822 @@
         $q = $this->fill_query_vars( $q );
 
+
+
+
+
+
+
+
+
+
+
         // Parse meta query.
         $this->meta_query = new WP_Meta_Query();
@@ -2241 +2263 @@
         }
 
-        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
+        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
             $groupby = "{$wpdb->posts}.ID";
         }
@@ -2317 +2339 @@
         }
         $where .= $search . $whichauthor . $whichmimetype;
+
+
+
+
 
         if ( ! empty( $this->meta_query->queries ) ) {

branches/5.9/src/wp-includes/comment.php

@@ -2487 +2487 @@
     }
 
+
+
+
+
+
+
+
+
+
     // Escape data pulled from DB.
     $comment = wp_slash( $comment );
@@ -2496 +2505 @@
 
     $commentarr = wp_filter_comment( $commentarr );
+
+
+
+
 
     // Now extract the merged array.

branches/5.9/src/wp-includes/customize/class-wp-customize-header-image-control.php

@@ -131 +131 @@
 
             <button type="button" class="choice thumbnail"
-                data-customize-image-value="{{{data.header.url}}}"
+                data-customize-image-value="{{}}"
                 data-customize-header-image-data="{{JSON.stringify(data.header)}}">
                 <span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
-                <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
+                <img src="{{}}" />
             </button>
 
@@ -159 +159 @@
                 <# } else { #>
 
-            <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
+            <img src="{{}}" />
 
                 <# } #>

branches/5.9/src/wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -69 +69 @@
                                 <img src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>" />
                             </div>
-                            <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
+                            <span class="browser-title" aria-hidden="true"><# print( '<?php  ); ?>' ) #></span>
                         </div>
                         <img class="app-icon-preview" src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>" />

branches/5.9/src/wp-includes/deprecated.php

@@ -4226 +4226 @@
     return wp_get_duotone_filter_property( $preset );
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/5.9/src/wp-includes/functions.php

@@ -3529 +3529 @@
         $html = __( 'The link you followed has expired.' );
         if ( wp_get_referer() ) {
+
+
             $html .= '</p><p>';
             $html .= sprintf(
                 '<a href="%s">%s</a>',
-                esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
+                esc_url(  ),
                 __( 'Please try again.' )
             );

branches/5.9/src/wp-includes/media-template.php

@@ -1494 +1494 @@
                 <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>" />
             </div>
-            <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
+            <span class="browser-title" aria-hidden="true"><# print( '<?php  ); ?>' ) #></span>
         </div>
 

branches/5.9/src/wp-includes/pluggable.php

@@ -92 +92 @@
      * @since 2.8.0
      * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
-     * @since 5.8.0 Returns the global `$current_user` if it's the user being fetched.
      *
      * @global WP_User $current_user The current user object which holds the user data.
@@ -101 +100 @@
      */
     function get_user_by( $field, $value ) {
-        global $current_user;
-
         $userdata = WP_User::get_data_by( $field, $value );
 
         if ( ! $userdata ) {
             return false;
-        }
-
-        if ( $current_user instanceof WP_User && $current_user->ID === (int) $userdata->ID ) {
-            return $current_user;
         }
 
@@ -362 +355 @@
         $phpmailer->clearCustomHeaders();
         $phpmailer->clearReplyTos();
+
+
 
         // Set "From" name and email.

branches/5.9/src/wp-includes/post.php

@@ -7928 +7928 @@
 
 /**
- * Filters the SQL clauses of an attachment query to include filenames.
- *
- * @since 4.7.0
- * @access private
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string[] $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
- *                          DISTINCT, fields (SELECT), and LIMITS clauses.
- * @return string[] The modified array of clauses.
- */
-function _filter_query_attachment_filenames( $clauses ) {
-    global $wpdb;
-    remove_filter( 'posts_clauses', __FUNCTION__ );
-
-    // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
-    $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
-
-    $clauses['groupby'] = "{$wpdb->posts}.ID";
-
-    $clauses['where'] = preg_replace(
-        "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
-        '$0 OR ( sq1.meta_value $1 $2 )',
-        $clauses['where']
-    );
-
-    return $clauses;
-}
-
-/**
  * Sets the last changed time for the 'posts' cache group.
  *

branches/5.9/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -98 +98 @@
         // Filter query clauses to include filenames.
         if ( isset( $query_args['s'] ) ) {
-            add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+            add_filter( '' );
         }
 

branches/5.9/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

@@ -146 +146 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Checks if a request has access to read terms in the specified taxonomy.
      *
@@ -166 +195 @@
                 array( 'status' => rest_authorization_required_code() )
             );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         }
 

branches/5.9/src/wp-includes/user.php

@@ -1711 +1711 @@
  * @since 3.0.0
  * @since 4.4.0 'clean_user_cache' action was added.
- * @since 5.8.0 Refreshes the global user instance if cleaning the user cache for the current user.
- *
- * @global WP_User $current_user The current user object which holds the user data.
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-    global $current_user;
-
     if ( is_numeric( $user ) ) {
         $user = new WP_User( $user );
@@ -1742 +1737 @@
      */
     do_action( 'clean_user_cache', $user->ID, $user );
-
-    // Refresh the global user instance if the cleaning current user.
-    if ( get_current_user_id() === (int) $user->ID ) {
-        $user_id      = (int) $user->ID;
-        $current_user = null;
-        wp_set_current_user( $user_id, '' );
-    }
 }
 

branches/5.9/src/wp-includes/widgets.php

@@ -1579 +1579 @@
     if ( is_wp_error( $rss ) ) {
         if ( is_admin() || current_user_can( 'manage_options' ) ) {
-            echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
+            echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . ) . '</p>';
         }
         return;
@@ -1702 +1702 @@
 
     if ( ! empty( $args['error'] ) ) {
-        echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
+        echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' .  . '</p>';
     }
 

branches/5.9/src/wp-mail.php

@@ -65 +65 @@
     wp_die( __( 'There doesn’t seem to be any new mail.' ) );
 }
+
+
+
 
 for ( $i = 1; $i <= $count; $i++ ) {
@@ -135 +138 @@
                 $author = sanitize_email( $author );
                 if ( is_email( $author ) ) {
-                    /* translators: %s: Post author email address. */
-                    echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
                     $userdata = get_user_by( 'email', $author );
                     if ( ! empty( $userdata ) ) {

branches/5.9/src/wp-trackback.php

@@ -13 +13 @@
     wp( array( 'tb' => '1' ) );
 }
+
+
+
 
 /**

branches/5.9/tests/phpunit/tests/pluggable.php

@@ -324 +324 @@
         return $signatures;
     }
-
-    /**
-     * @ticket 28020
-     */
-    public function test_get_user_by_should_return_same_instance_as_wp_get_current_user() {
-        // Create a test user.
-        $new_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
-
-        // Set the test user as the current user.
-        $current_user = wp_set_current_user( $new_user );
-
-        // Get the test user using get_user_by().
-        $from_get_user_by = get_user_by( 'id', $new_user );
-
-        $this->assertSame( $current_user, $from_get_user_by );
-    }
 }

branches/5.9/tests/phpunit/tests/query/search.php

@@ -455 +455 @@
 
         add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
 
         // Pass post_type a string value.
@@ -485 +485 @@
 
         add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
 
         // Pass post_type an array value.
@@ -544 +544 @@
         add_post_meta( $attachment, '_wp_attached_file', 'some-image4.png', true );
         add_post_meta( $attachment, '_test_meta_key', 'value', true );
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
 
         // Pass post_type a string value.
@@ -584 +584 @@
 
         add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+        add_filter( '' );
 
         // Pass post_type a string value.
@@ -609 +609 @@
      * @ticket 22744
      */
-    public function test_filter_query_attachment_filenames_unhooks_itself() {
-        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-        apply_filters(
-            'posts_clauses',
-            array(
-                'where'    => '',
-                'groupby'  => '',
-                'join'     => '',
-                'orderby'  => '',
-                'distinct' => '',
-                'fields'   => '',
-                'limit'    => '',
-            )
-        );
-
-        $result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-        $this->assertFalse( $result );
+    public function test_wp_query_removes_filter_wp_allow_query_attachment_by_filename() {
+        $attachment = self::factory()->post->create(
+            array(
+                'post_type'    => 'attachment',
+                'post_status'  => 'publish',
+                'post_title'   => 'bar foo',
+                'post_content' => 'foo bar',
+                'post_excerpt' => 'This post has foo',
+            )
+        );
+
+        add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
+        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+
+        $q = new WP_Query(
+            array(
+                's'           => 'image1',
+                'fields'      => 'ids',
+                'post_type'   => 'attachment',
+                'post_status' => 'inherit',
+            )
+        );
+
+        $this->assertSame( array( $attachment ), $q->posts );
+
+        /*
+         * WP_Query should have removed the wp_allow_query_attachment_by_filename filter
+         * and thus not match the attachment created above
+         */
+        $q->get_posts();
+        $this->assertEmpty( $q->posts );
     }
 

branches/5.9/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -2973 +2973 @@
                     'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
                     'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+
                 ),
                 array(
@@ -2981 +2982 @@
                     'author_name'       => 'div strong',
                     'author_user_agent' => 'div strong',
+
                 )
             );
@@ -2990 +2992 @@
                     'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
                     'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+
                 ),
                 array(
@@ -2998 +3001 @@
                     'author_name'       => 'div strong',
                     'author_user_agent' => 'div strong',
+
                 )
             );
@@ -3012 +3016 @@
                 'author_name'       => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
                 'author_user_agent' => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
+
             ),
             array(
@@ -3020 +3025 @@
                 'author_name'       => '\\\&amp;\\\ &amp; &amp;invalid; &lt; &lt; &amp;lt;',
                 'author_user_agent' => '\\\&\\\ &amp; &invalid; &lt; &lt; &amp;lt;',
+
             )
         );
@@ -3033 +3039 @@
                 'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
                 'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+
             ),
             array(
@@ -3041 +3048 @@
                 'author_name'       => 'div strong',
                 'author_user_agent' => 'div strong',
+
             )
         );