Merge branch 'jaska120-jaska120-patch-1' into trunk

Yoast · Jul 12, 2018 · c8e9604 · c8e9604
2 parents ea58a7a + 7d0a2a7
commit c8e9604
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/frontend/class-frontend.php b/frontend/class-frontend.php
@@ -718,7 +718,7 @@ public function robots() {
 		$robots['follow'] = 'follow';
 		$robots['other']  = array();
 
-		if ( ( is_object( $post ) && is_singular() ) || ( WPSEO_Utils::is_woocommerce_active() && is_shop() ) ) {
+		if ( ( is_object( $post ) && is_singular() ) || $this->woocommerce_shop_page->is_shop_page() ) {
 			$private = 'private' === $post->post_status;
 			$noindex = ! WPSEO_Post_Type::is_post_type_indexable( $post->post_type );