Changeset 53969 for branches/5.4

Timestamp:

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

Author:

SergeyBiryukov

Message:

Grouped backports to the 5.4 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.4 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.

Location:

branches/5.4

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.4/composer.json

@@ -20 +20 @@
         "yoast/phpunit-polyfills": "^1.0.1"
     },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "scripts": {
         "compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",

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

@@ -494 +494 @@
             __( 'The plugin %1$s has been deactivated 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>';
@@ -554 +554 @@
                     /* translators: %s: Error message. */
                     __( 'Plugin could not be deleted due to an error: %s' ),
-                    $delete_result->get_error_message()
+                    esc_html( $delete_result->get_error_message() )
                 );
                 ?>

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

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

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

@@ -1085 +1085 @@
  * @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()' );
     $keys = get_post_custom_keys();
     if ( $keys ) {
@@ -1103 +1104 @@
                 "<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 )
             );