diff --git a/wp-includes/robots-template.php b/wp-includes/robots-template.php index 19c7699790..f504930093 100644 --- a/wp-includes/robots-template.php +++ b/wp-includes/robots-template.php @@ -15,6 +15,7 @@ * robots meta tag is output if there is at least one relevant directive. * * @since 5.7.0 + * @since 5.7.1 No longer prevents specific directives to occur together. */ function wp_robots() { /** @@ -30,20 +31,6 @@ function wp_robots() { */ $robots = apply_filters( 'wp_robots', array() ); - // Don't allow mutually exclusive directives. - if ( ! empty( $robots['follow'] ) ) { - unset( $robots['nofollow'] ); - } - if ( ! empty( $robots['nofollow'] ) ) { - unset( $robots['follow'] ); - } - if ( ! empty( $robots['archive'] ) ) { - unset( $robots['noarchive'] ); - } - if ( ! empty( $robots['noarchive'] ) ) { - unset( $robots['archive'] ); - } - $robots_strings = array(); foreach ( $robots as $directive => $value ) { if ( is_string( $value ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 93b3b594ae..480acfd664 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7.1-alpha-50584'; +$wp_version = '5.7.1-alpha-50587'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.