Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-14 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity

Grouped backports to the 5.2 branch.

Browse Source 
- 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.

Built from https://develop.svn.wordpress.org/branches/5.2@53971


git-svn-id: http://core.svn.wordpress.org/branches/5.2@53530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-08-30 15:39:45 +00:00
parent 65e7638ee8
commit aa4f24179e
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

@ -486,7 +486,7 @@ if ( ! empty( $invalid ) ) {
/* translators: 1: plugin file, 2: error message */ /* translators: 1: plugin file, 2: error message */
__( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ), __( 'The plugin %1$s has been <strong>deactivated</strong> 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>';
} }
@ -539,7 +539,7 @@ elseif ( isset( $_GET['deleted'] ) ) :
if ( is_wp_error( $delete_result ) ) : 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 : ?> <?php else : ?>
<div id="message" class="updated notice is-dismissible"> <div id="message" class="updated notice is-dismissible">
<p> <p>

2
wp-includes/bookmark.php
View File

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

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

@ -1075,9 +1075,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()' );
if ( $keys = get_post_custom_keys() ) { if ( $keys = get_post_custom_keys() ) {
$li_html = ''; $li_html = '';
foreach ( (array) $keys as $key ) { foreach ( (array) $keys as $key ) {
@ -1092,8 +1093,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 )
); );
/** /**