Grouped backports to the 5.1 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.1 branch. Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs. Built from https://develop.svn.wordpress.org/branches/5.1@53972 git-svn-id: http://core.svn.wordpress.org/branches/5.1@53531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2108a32b6b
commit
f5cc02c70c
|
@ -466,7 +466,7 @@ if ( ! empty( $invalid ) ) {
|
|||
/* translators: 1: plugin file, 2: error message */
|
||||
__( 'The plugin %1$s has been <strong>deactivated</strong> 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>';
|
||||
}
|
||||
|
@ -517,7 +517,7 @@ elseif ( isset( $_GET['deleted'] ) ) :
|
|||
|
||||
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 : ?>
|
||||
<div id="message" class="updated notice is-dismissible">
|
||||
<p>
|
||||
|
|
|
@ -292,7 +292,7 @@ function get_bookmarks( $args = '' ) {
|
|||
$query .= " $exclusions $inclusions $search";
|
||||
$query .= " ORDER BY $orderby $order";
|
||||
if ( $r['limit'] != -1 ) {
|
||||
$query .= ' LIMIT ' . $r['limit'];
|
||||
$query .= ' LIMIT ' . absint( $r['limit'] );
|
||||
}
|
||||
|
||||
$results = $wpdb->get_results( $query );
|
||||
|
|
|
@ -1047,9 +1047,10 @@ function post_custom( $key = '' ) {
|
|||
*
|
||||
* @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()' );
|
||||
if ( $keys = get_post_custom_keys() ) {
|
||||
$li_html = '';
|
||||
foreach ( (array) $keys as $key ) {
|
||||
|
@ -1064,8 +1065,8 @@ function the_meta() {
|
|||
$html = sprintf(
|
||||
"<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 )
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue