Merge branch 'develop' of github.com:ampproject/amp-wp into add/amp-u…

…rl-customization * 'develop' of github.com:ampproject/amp-wp: Use wp_robots() instead of noindex() in WP 5.7 (#5793) Bump eslint-plugin-jsdoc from 31.0.3 to 31.0.4 Bump google/cloud-storage from 1.23.0 to 1.23.1 Bump @wordpress/block-editor from 5.2.0 to 5.2.1
ampproject · Jan 21, 2021 · ac0d0b9 · ac0d0b9
2 parents 651b411 + 9f14d61
commit ac0d0b9
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 225 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/amp-post-template-functions.php b/includes/amp-post-template-functions.php
@@ -11,7 +11,11 @@
  * @internal
  */
 function amp_post_template_init_hooks() {
-	add_action( 'amp_post_template_head', 'noindex' );
+	if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.7', '>=' ) ) {
+		add_action( 'amp_post_template_head', 'wp_robots' );
+	} else {
+		add_action( 'amp_post_template_head', 'noindex' );
+	}
 	add_action( 'amp_post_template_head', 'amp_post_template_add_title' );
 	add_action( 'amp_post_template_head', 'amp_post_template_add_canonical' );
 	add_action( 'amp_post_template_head', 'amp_post_template_add_fonts' );