diff --git a/wp-includes/query.php b/wp-includes/query.php index 7a210b09f1..d4ac780212 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -939,6 +939,11 @@ function is_main_query() { */ function have_posts() { global $wp_query; + + if ( ! isset( $wp_query ) ) { + return false; + } + return $wp_query->have_posts(); } @@ -957,6 +962,11 @@ function have_posts() { */ function in_the_loop() { global $wp_query; + + if ( ! isset( $wp_query ) ) { + return false; + } + return $wp_query->in_the_loop; } @@ -969,6 +979,11 @@ function in_the_loop() { */ function rewind_posts() { global $wp_query; + + if ( ! isset( $wp_query ) ) { + return; + } + $wp_query->rewind_posts(); } @@ -981,6 +996,11 @@ function rewind_posts() { */ function the_post() { global $wp_query; + + if ( ! isset( $wp_query ) ) { + return; + } + $wp_query->the_post(); } @@ -999,6 +1019,11 @@ function the_post() { */ function have_comments() { global $wp_query; + + if ( ! isset( $wp_query ) ) { + return false; + } + return $wp_query->have_comments(); } @@ -1008,12 +1033,15 @@ function have_comments() { * @since 2.2.0 * * @global WP_Query $wp_query WordPress Query object. - * - * @return null */ function the_comment() { global $wp_query; - return $wp_query->the_comment(); + + if ( ! isset( $wp_query ) ) { + return; + } + + $wp_query->the_comment(); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index db5e8fd4b5..ab729ba84b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53428'; +$wp_version = '6.1-alpha-53429'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.