Changeset 8114

Timestamp:

01/20/2019 11:02:50 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Consolidate noindex tag output in Template::output_meta().

See #4088.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-template.php (modified) (2 diffs)
• themes/pub/wporg-plugins/functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -134 +134 @@
      */
     public static function output_meta() {
-        $metas = [];
-
-        if ( is_singular( 'plugin' ) ) {
+        $metas   = [];
+        $noindex = false;
+
+        // Prevent duplicate search engine results.
+        if ( get_query_var( 'plugin_advanced' ) || is_search() ) {
+            $noindex = true;
+        } elseif ( is_singular( 'plugin' ) ) {
             $metas[] = sprintf(
                 '<meta name="description" value="%s" />',
@@ -142 +146 @@
             );
 
-            // Add noindex on disabled plugin page.
+            // Add noindex for closed plugins.
             if ( 'publish' !== get_post_status() ) {
-                $metas[] = '<meta name="robots" content="noindex" />';
-            }
+                $noindex = true;
+            }
+        }
+
+        if ( $noindex ) {
+            $metas[] = '<meta name="robots" content="noindex,follow" />' . "\n";
         }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php

@@ -303 +303 @@
     }
 
-    // Prevent duplicate search engine results.
-    if ( get_query_var( 'plugin_advanced' ) || is_search() ) {
-        echo '<meta name="robots" content="noindex, follow" />' . "\n";
-    }
-
     if ( ! is_singular( 'plugin' ) ) {
         return;