Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Built from https://develop.svn.wordpress.org/branches/5.4@53969


git-svn-id: http://core.svn.wordpress.org/branches/5.4@53528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-08-30 15:36:55 +00:00
parent a17214dd2f
commit bbe1981534
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/plugins.php
View File

@ -493,7 +493,7 @@ if ( ! empty( $invalid ) ) {
/* translators: 1: Plugin file, 2: Error message. */ /* translators: 1: Plugin file, 2: Error message. */
__( 'The plugin %1$s has been deactivated due to an error: %2$s' ), __( 'The plugin %1$s has been deactivated due to an error: %2$s' ),
'<code>' . esc_html( $plugin_file ) . '</code>', '<code>' . esc_html( $plugin_file ) . '</code>',
$error->get_error_message() esc_html( $error->get_error_message() )
); );
echo '</p></div>'; echo '</p></div>';
} }
@ -553,7 +553,7 @@ elseif ( isset( $_GET['deleted'] ) ) :
printf( printf(
/* translators: %s: Error message. */ /* translators: %s: Error message. */
__( 'Plugin could not be deleted due to an error: %s' ), __( 'Plugin could not be deleted due to an error: %s' ),
$delete_result->get_error_message() esc_html( $delete_result->get_error_message() )
); );
?> ?>
</p> </p>

2
wp-includes/bookmark.php
View File

@ -306,7 +306,7 @@ function get_bookmarks( $args = '' ) {
$query .= " $exclusions $inclusions $search"; $query .= " $exclusions $inclusions $search";
$query .= " ORDER BY $orderby $order"; $query .= " ORDER BY $orderby $order";
if ( -1 != $parsed_args['limit'] ) { if ( -1 != $parsed_args['limit'] ) {
$query .= ' LIMIT ' . $parsed_args['limit']; $query .= ' LIMIT ' . absint( $parsed_args['limit'] );
} }
$results = $wpdb->get_results( $query ); $results = $wpdb->get_results( $query );

7
wp-includes/post-template.php
View File

@ -1084,9 +1084,10 @@ function post_custom( $key = '' ) {
* *
* @since 1.2.0 * @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() { function the_meta() {
_deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
$keys = get_post_custom_keys(); $keys = get_post_custom_keys();
if ( $keys ) { if ( $keys ) {
$li_html = ''; $li_html = '';
@ -1102,8 +1103,8 @@ function the_meta() {
$html = sprintf( $html = sprintf(
"<li><span class='post-meta-key'>%s</span> %s</li>\n", "<li><span class='post-meta-key'>%s</span> %s</li>\n",
/* translators: %s: Post custom field name. */ /* translators: %s: Post custom field name. */
sprintf( _x( '%s:', 'Post custom field name' ), $key ), esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
$value esc_html( $value )
); );
/** /**