diff --git a/wp-includes/blocks/rss.php b/wp-includes/blocks/rss.php index 0300585de2..0315cfc013 100644 --- a/wp-includes/blocks/rss.php +++ b/wp-includes/blocks/rss.php @@ -20,10 +20,6 @@ function render_block_core_rss( $attributes ) { } if ( ! $rss->get_item_quantity() ) { - // PHP 5.2 compatibility. See: http://simplepie.org/wiki/faq/i_m_getting_memory_leaks. - $rss->__destruct(); - unset( $rss ); - return '
' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '
'; } @@ -96,13 +92,7 @@ function render_block_core_rss( $attributes ) { $class .= ' ' . $attributes['className']; } - $list_items_markup = ""; - - // PHP 5.2 compatibility. See: http://simplepie.org/wiki/faq/i_m_getting_memory_leaks. - $rss->__destruct(); - unset( $rss ); - - return $list_items_markup; + return ""; } /** diff --git a/wp-includes/blocks/search.php b/wp-includes/blocks/search.php index 6cd909fc6f..67bc90ff35 100644 --- a/wp-includes/blocks/search.php +++ b/wp-includes/blocks/search.php @@ -25,6 +25,12 @@ function render_block_core_search( $attributes ) { $input_id, $attributes['label'] ); + } else { + $label_markup = sprintf( + '', + $input_id, + __( 'Search' ) + ); } $input_markup = sprintf( @@ -45,7 +51,6 @@ function render_block_core_search( $attributes ) { if ( isset( $attributes['className'] ) ) { $class .= ' ' . $attributes['className']; } - if ( isset( $attributes['align'] ) ) { $class .= ' align' . $attributes['align']; } diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index 658e66bb9c..7a96e0160b 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -694,10 +694,11 @@ class WP_Query { * @type string $pagename Page slug. * @type string $perm Show posts if user has the appropriate capability. * @type string $ping_status Ping status. - * @type array $post__in An array of post IDs to retrieve, sticky posts will be included - * @type string $post_mime_type The mime type of the post. Used for 'attachment' post_type. + * @type array $post__in An array of post IDs to retrieve, sticky posts will be included. * @type array $post__not_in An array of post IDs not to retrieve. Note: a string of comma- * separated IDs will NOT work. + * @type string $post_mime_type The mime type of the post. Used for 'attachment' post_type. + * @type array $post_name__in An array of post slugs that results must match. * @type int $post_parent Page ID to retrieve child pages for. Use 0 to only retrieve * top-level pages. * @type array $post_parent__in An array containing parent page IDs to query child pages from. @@ -708,7 +709,6 @@ class WP_Query { * @type int $posts_per_page The number of posts to query for. Use -1 to request all posts. * @type int $posts_per_archive_page The number of posts to query for by archive page. Overrides * 'posts_per_page' when is_archive(), or is_search() are true. - * @type array $post_name__in An array of post slugs that results must match. * @type string $s Search keyword(s). Prepending a term with a hyphen will * exclude posts matching that term. Eg, 'pillow -sofa' will * return posts containing 'pillow' but not 'sofa'. The diff --git a/wp-includes/version.php b/wp-includes/version.php index b2073b5134..aaf75ceaf8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-47051'; +$wp_version = '5.4-alpha-47052'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.