Skip to content

Commit c440a36

Browse files
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. git-svn-id: https://develop.svn.wordpress.org/branches/5.4@53969 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 41d05c3 commit c440a36

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"phpunit/phpunit": "^5.7.21 || ^6.5 || ^7.5",
2020
"yoast/phpunit-polyfills": "^1.0.1"
2121
},
22+
"config": {
23+
"allow-plugins": {
24+
"dealerdirect/phpcodesniffer-composer-installer": true
25+
}
26+
},
2227
"scripts": {
2328
"compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",
2429
"format": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf --report=summary,source",

src/wp-admin/plugins.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
/* translators: 1: Plugin file, 2: Error message. */
494494
__( 'The plugin %1$s has been deactivated due to an error: %2$s' ),
495495
'<code>' . esc_html( $plugin_file ) . '</code>',
496-
$error->get_error_message()
496+
esc_html( $error->get_error_message() )
497497
);
498498
echo '</p></div>';
499499
}
@@ -553,7 +553,7 @@
553553
printf(
554554
/* translators: %s: Error message. */
555555
__( 'Plugin could not be deleted due to an error: %s' ),
556-
$delete_result->get_error_message()
556+
esc_html( $delete_result->get_error_message() )
557557
);
558558
?>
559559
</p>

src/wp-includes/bookmark.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ function get_bookmarks( $args = '' ) {
306306
$query .= " $exclusions $inclusions $search";
307307
$query .= " ORDER BY $orderby $order";
308308
if ( -1 != $parsed_args['limit'] ) {
309-
$query .= ' LIMIT ' . $parsed_args['limit'];
309+
$query .= ' LIMIT ' . absint( $parsed_args['limit'] );
310310
}
311311

312312
$results = $wpdb->get_results( $query );

src/wp-includes/post-template.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,9 +1084,10 @@ function post_custom( $key = '' ) {
10841084
*
10851085
* @since 1.2.0
10861086
*
1087-
* @internal This will probably change at some point...
1087+
* @deprecated 6.0.2 Use get_post_meta() to retrieve post meta and render manually.
10881088
*/
10891089
function the_meta() {
1090+
_deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
10901091
$keys = get_post_custom_keys();
10911092
if ( $keys ) {
10921093
$li_html = '';
@@ -1102,8 +1103,8 @@ function the_meta() {
11021103
$html = sprintf(
11031104
"<li><span class='post-meta-key'>%s</span> %s</li>\n",
11041105
/* translators: %s: Post custom field name. */
1105-
sprintf( _x( '%s:', 'Post custom field name' ), $key ),
1106-
$value
1106+
esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
1107+
esc_html( $value )
11071108
);
11081109

11091110
/**

0 commit comments

Comments
 (0)