From 6c5e9f3656d2ac7e2192c9ee72f95e1da77e7c4e Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Fri, 26 Mar 2021 00:28:03 +0000
Subject: [PATCH] Robots: Remove contradictory directive check in
 `wp_robots()`.

Removes the mutually exclusive directives check in `wp_robots()`, ie allow both `follow` and `nofollow` to be specified and for `archive` and `noarchive` to be specified.

This fixes a bug in which WordPress would defer to the most permissive over the least permissive. When contradictory instructions are included, WordPress will defer to the search engine's or archivist's resolution policy: generally this is to observe the least, not most permissive.

Props Cybr, flixos90, SergeyBiryukov.
Merges [50566] to the 5.7 branch.
Fixes #52713.

Built from https://develop.svn.wordpress.org/branches/5.7@50587


git-svn-id: http://core.svn.wordpress.org/branches/5.7@50200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/robots-template.php | 15 +--------------
 wp-includes/version.php         |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

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.