Skip to content

Commit c76b655

Browse files
Grouped backports to the 5.3 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.3 branch. Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs. git-svn-id: https://develop.svn.wordpress.org/branches/5.3@53970 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f019ba5 commit c76b655

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
@@ -488,7 +488,7 @@
488488
/* translators: 1: Plugin file, 2: Error message. */
489489
__( 'The plugin %1$s has been deactivated due to an error: %2$s' ),
490490
'<code>' . esc_html( $plugin_file ) . '</code>',
491-
$error->get_error_message()
491+
esc_html( $error->get_error_message() )
492492
);
493493
echo '</p></div>';
494494
}
@@ -548,7 +548,7 @@
548548
printf(
549549
/* translators: %s: Error message. */
550550
__( 'Plugin could not be deleted due to an error: %s' ),
551-
$delete_result->get_error_message()
551+
esc_html( $delete_result->get_error_message() )
552552
);
553553
?>
554554
</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 ( $parsed_args['limit'] != -1 ) {
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
@@ -1081,9 +1081,10 @@ function post_custom( $key = '' ) {
10811081
*
10821082
* @since 1.2.0
10831083
*
1084-
* @internal This will probably change at some point...
1084+
* @deprecated 6.0.2 Use get_post_meta() to retrieve post meta and render manually.
10851085
*/
10861086
function the_meta() {
1087+
_deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
10871088
$keys = get_post_custom_keys();
10881089
if ( $keys ) {
10891090
$li_html = '';
@@ -1099,8 +1100,8 @@ function the_meta() {
10991100
$html = sprintf(
11001101
"<li><span class='post-meta-key'>%s</span> %s</li>\n",
11011102
/* translators: %s: Post custom field name. */
1102-
sprintf( _x( '%s:', 'Post custom field name' ), $key ),
1103-
$value
1103+
esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
1104+
esc_html( $value )
11041105
);
11051106

11061107
/**

0 commit comments

Comments
 (0)