Merge branch 'hotfix/1.4.3'

ClassicPress · Sep 3, 2022 · e97769a · e97769a
2 parents 93a4bd1 + d80ac95
commit e97769a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
@@ -455,7 +455,8 @@
 			/* 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>';
 	}
 }
@@ -489,8 +490,19 @@
 		// Delete it once we're done.
 		delete_transient( 'plugins_delete_result_' . $user_ID );
 
-		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>
+		if ( is_wp_error( $delete_result ) ) :
+			?>
+			<div id="message" class="error notice is-dismissible">
+				<p>
+					<?php
+					printf(
+						/* translators: %s: Error message. */
+						__( '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>

diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
@@ -282,7 +282,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 );

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
@@ -1001,10 +1001,11 @@ function post_custom( $key = '' ) {
  *
  * @since WP-1.2.0
  *
- * @internal This will probably change at some point...
+ * @deprecated WP-6.0.2 Use get_post_meta() to retrieve post meta and render manually.
  *
  */
 function the_meta() {
+	_deprecated_function( __FUNCTION__, 'WP-6.0.2', 'get_post_meta()' );
 	if ( $keys = get_post_custom_keys() ) {
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
@@ -1016,10 +1017,11 @@ function the_meta() {
 			$values = array_map( 'trim', get_post_custom_values( $key ) );
 			$value  = implode( ', ', $values );
 
-			$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
+			$html = sprintf(
+				"<li><span class='post-meta-key'>%s</span> %s</li>\n",
+				/* translators: %s: Post custom field name. */
+				esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
+				esc_html( $value )
 			);
 
 			/**

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -53,7 +53,7 @@ function classicpress_asset_version( $type = 'script', $handle = null ) {
 	static $default_version;
 
 	if ( empty( $default_version ) ) {
-		$default_version = 'cp_70dc09dd';
+		$default_version = 'cp_e9701af3';
 	}
 
 	/**

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -27,7 +27,7 @@
  *
  * @global string $cp_version
  */
-$cp_version = '1.4.2';
+$cp_version = '1.4.3';
 
 /**
  * The WordPress version string