diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index d5ceeccd61..b91dad9610 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -75,13 +75,13 @@ wp_enqueue_script( 'svg-painter' );
$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
?>
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index bea4084c30..58ffcddfc3 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -544,6 +544,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
* @deprecated 3.5.0
*/
public function wp_set_background_image() {
+ check_ajax_referer( 'custom-background' );
if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
$attachment_id = absint($_POST['attachment_id']);
/** This filter is documented in wp-admin/includes/media.php */
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index b9aecf2485..0fce7f237b 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -326,7 +326,7 @@ class Custom_Image_Header {
?>
addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
-var ajaxurl = '',
- pagenow = 'id; ?>',
- typenow = 'post_type; ?>',
- adminpage = '',
- thousandsSeparator = 'number_format['thousands_sep'] ); ?>',
- decimalPoint = 'number_format['decimal_point'] ); ?>',
+var ajaxurl = '',
+ pagenow = 'id ); ?>',
+ typenow = 'post_type ); ?>',
+ adminpage = '',
+ thousandsSeparator = 'number_format['thousands_sep'] ); ?>',
+ decimalPoint = 'number_format['decimal_point'] ); ?>',
isRtl = ;
-
+
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index eb96158c08..3bb084e1ef 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -215,7 +215,7 @@ if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users
require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
diff --git a/wp-includes/Requests/Utility/FilteredIterator.php b/wp-includes/Requests/Utility/FilteredIterator.php
index 76a29e7228..b90cbcd76a 100644
--- a/wp-includes/Requests/Utility/FilteredIterator.php
+++ b/wp-includes/Requests/Utility/FilteredIterator.php
@@ -42,4 +42,5 @@ class Requests_Utility_FilteredIterator extends ArrayIterator {
$value = call_user_func($this->callback, $value);
return $value;
}
+
}
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 9b80f0dfe1..b057429cfc 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -3580,6 +3580,21 @@ class wp_xmlrpc_server extends IXR_Server {
return new IXR_Error( 403, __( 'Comment is required.' ) );
}
+ if (
+ 'publish' === get_post_status( $post_id ) &&
+ ! current_user_can( 'edit_post', $post_id ) &&
+ post_password_required( $post_id )
+ ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
+ }
+
+ if (
+ 'private' === get_post_status( $post_id ) &&
+ ! current_user_can( 'read_post', $post_id )
+ ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
+ }
+
$comment = array(
'comment_post_ID' => $post_id,
'comment_content' => $content_struct['content'],
@@ -3965,8 +3980,10 @@ class wp_xmlrpc_server extends IXR_Server {
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getMediaItem' );
- if ( ! $attachment = get_post($attachment_id) )
+ $attachment = get_post( $attachment_id );
+ if ( ! $attachment || 'attachment' !== $attachment->post_type ) {
return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+ }
return $this->_prepare_media_item( $attachment );
}
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 1a6b05f20a..be7bd49e05 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1076,9 +1076,9 @@ function wp_check_invalid_utf8( $string, $strip = false ) {
* @return string String with Unicode encoded for URI.
*/
function utf8_uri_encode( $utf8_string, $length = 0 ) {
- $unicode = '';
- $values = array();
- $num_octets = 1;
+ $unicode = '';
+ $values = array();
+ $num_octets = 1;
$unicode_length = 0;
mbstring_binary_safe_encoding();
@@ -1090,9 +1090,10 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
$value = ord( $utf8_string[ $i ] );
if ( $value < 128 ) {
- if ( $length && ( $unicode_length >= $length ) )
+ if ( $length && ( $unicode_length >= $length ) ) {
break;
- $unicode .= chr($value);
+ }
+ $unicode .= chr( $value );
$unicode_length++;
} else {
if ( count( $values ) == 0 ) {
@@ -1993,7 +1994,7 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
if (function_exists('mb_strtolower')) {
$title = mb_strtolower($title, 'UTF-8');
}
- $title = utf8_uri_encode($title, 200);
+ $title = utf8_uri_encode( $title, 200 );
}
$title = strtolower($title);
diff --git a/wp-includes/meta.php b/wp-includes/meta.php
index 1aca31a62c..da65aca408 100644
--- a/wp-includes/meta.php
+++ b/wp-includes/meta.php
@@ -916,8 +916,9 @@ function _get_meta_table($type) {
* @param string|null $meta_type
* @return bool True if the key is protected, false otherwise.
*/
-function is_protected_meta( $meta_key, $meta_type = null ) {
- $protected = ( '_' == $meta_key[0] );
+function is_protected_meta( $meta_key, $meta_type = '' ) {
+ $sanitized_key = preg_replace( "/[^\x20-\x7E\p{L}]/", '', $meta_key );
+ $protected = strlen( $sanitized_key ) > 0 && ( '_' == $sanitized_key[0] );
/**
* Filters whether a meta key is protected.