Changeset 53971

Timestamp:

08/30/2022 03:38:30 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Grouped backports to the 5.2 branch.

• Posts, Post Types: Escape output within the_meta().
• General: Ensure bookmark query limits are numeric.
• Plugins: Escape output in error messages.
• Build/Test Tools: Allow the PHPCS plugin in Composer configuration.

Merges [52412,53958-53960] to the 5.2 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• composer.json (modified) (1 diff)
• src/wp-admin/plugins.php (modified) (2 diffs)
• src/wp-includes/bookmark.php (modified) (1 diff)
• src/wp-includes/post-template.php (modified) (2 diffs)

branches/5.2/composer.json

@@ -16 +16 @@
                 "yoast/phpunit-polyfills": "^1.0.1"
         },
+        "config": {
+                "allow-plugins": {
+                        "dealerdirect/phpcodesniffer-composer-installer": true
+                }
+        },
         "scripts": {
                 "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",

branches/5.2/src/wp-admin/plugins.php

@@ -487 +487 @@
                         __( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
                         '<code>' . esc_html( $plugin_file ) . '</code>',
-                        $error->get_error_message()
+                        esc_html( $error->get_error_message() )
                 );
                 echo '</p></div>';
@@ -540 +540 @@
         if ( is_wp_error( $delete_result ) ) :
                 ?>
-                <div id="message" class="error notice is-dismissible"><p><?php printf( __( 'Plugin could not be deleted due to an error: %s' ), $delete_result->get_error_message() ); ?></p></div>
+                <div id="message" class="error notice is-dismissible"><p><?php printf( __( 'Plugin could not be deleted due to an error: %s' ), esc_html( $delete_result->get_error_message() ) ); ?></p></div>
                 <?php else : ?>
                 <div id="message" class="updated notice is-dismissible">

branches/5.2/src/wp-includes/bookmark.php

@@ -293 +293 @@
         $query .= " ORDER BY $orderby $order";
         if ( $r['limit'] != -1 ) {
-                $query .= ' LIMIT ' . $r['limit'];
+                $query .= ' LIMIT ' . absint( $r['limit'] );
         }
 

branches/5.2/src/wp-includes/post-template.php

@@ -1076 +1076 @@
  * @since 1.2.0
  *
- * @internal This will probably change at some point...
+ * @deprecated 6.0.2 Use get_post_meta() to retrieve post meta and render manually.
  */
 function the_meta() {
+        _deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
         if ( $keys = get_post_custom_keys() ) {
                 $li_html = '';
@@ -1093 +1094 @@
                                 "<li><span class='post-meta-key'>%s</span> %s</li>\n",
                                 /* translators: %s: Post custom field name */
-                                sprintf( _x( '%s:', 'Post custom field name' ), $key ),
-                                $value
+                                esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
+                                esc_html( $value )
                         );