Changeset 50371

Timestamp:

02/17/2021 10:49:13 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Robots: Rename wp_embed_no_robots to wp_robots_noindex_embeds().

This brings the naming in line with wp_robots_noindex_search().

Follow-up to [49992], [50370].

See #51511, #52457.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (2 diffs)
• embed.php (modified) (1 diff)
• robots-template.php (modified) (3 diffs)

trunk/src/wp-includes/default-filters.php

@@ -239 +239 @@
 // Robots filters.
 add_filter( 'wp_robots', 'wp_robots_noindex' );
+add_filter( 'wp_robots', 'wp_robots_noindex_embeds' );
 add_filter( 'wp_robots', 'wp_robots_noindex_search' );
 add_filter( 'wp_robots', 'wp_robots_max_image_preview_large' );
@@ -612 +613 @@
 add_action( 'embed_footer', 'wp_print_footer_scripts', 20 );
 
-add_filter( 'wp_robots', 'wp_embed_no_robots' );
 add_filter( 'excerpt_more', 'wp_embed_excerpt_more', 20 );
 add_filter( 'the_excerpt_embed', 'wptexturize' );

trunk/src/wp-includes/embed.php

@@ -1244 +1244 @@
     return $result;
 }
-
-/**
- * Adds noindex to the robots meta tag for embeds.
- *
- * Typical usage is as a {@see 'wp_robots'} callback:
- *
- *     add_filter( 'wp_robots', 'wp_embed_no_robots' );
- *
- * @since 5.7.0
- *
- * @param array $robots Associative array of robots directives.
- * @return array Filtered robots directives.
- */
-function wp_embed_no_robots( array $robots ) {
-    if ( ! is_embed() ) {
-        return $robots;
-    }
-
-    return wp_robots_no_robots( $robots );
-}

trunk/src/wp-includes/robots-template.php

@@ -75 +75 @@
  *
  * @since 5.7.0
+ *
  * @see wp_robots_no_robots()
  *
@@ -89 +90 @@
 
 /**
+ * Adds noindex to the robots meta tag for embeds.
+ *
+ * Typical usage is as a {@see 'wp_robots'} callback:
+ *
+ *     add_filter( 'wp_robots', 'wp_robots_noindex_embeds' );
+ *
+ * @since 5.7.0
+ *
+ * @see wp_robots_no_robots()
+ *
+ * @param array $robots Associative array of robots directives.
+ * @return array Filtered robots directives.
+ */
+function wp_robots_noindex_embeds( array $robots ) {
+    if ( is_embed() ) {
+        return wp_robots_no_robots( $robots );
+    }
+
+    return $robots;
+}
+
+/**
  * Adds noindex to the robots meta tag if a search is being performed.
  *
@@ -100 +123 @@
  *
  * @since 5.7.0
+ *
  * @see wp_robots_no_robots()
  *