Changeset 56657

Timestamp:

09/22/2023 12:02:28 AM (8 months ago)

Author:

SergeyBiryukov

Message:

Media: Disable attachment pages for new installations.

WordPress creates attachment pages by default for every attachment uploaded. On the vast majority of sites, these attachment pages don't contain any meaningful information. They do however exist, get indexed by search engines, and sometimes even rank in search results, leading to bad results for users and site owners.

This commit introduces a wp_attachment_pages_enabled database option to control the attachment pages behavior:

• On existing sites, the option is set to 1 on upgrade, so that attachment pages continue to work as is.
• For new sites, the option is set to to 0 by default, which means attachment pages are redirected to the attachment URL.
• Sites that want to enable or disable the attachment pages can set the option to 1 or 0, respectively.

Follow-up to [2958], [3303], [7149], [34690].

Props aristath, poena, afercia, joostdevalk, jonoaldersonwp, azaozz, johnbillion, joedolson, basiliskan, audrasjb, davelo, rilwis, manfcarlo, tyxla, garrett-eclipse, seedsca, eatingrules, matveb, antpb, zodiac1978, oglekler, zunaid321, costdev, SergeyBiryukov.
Fixes #57913.

Location:

trunk

Files:

• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-includes/canonical.php (modified) (2 diffs)
• src/wp-includes/version.php (modified) (1 diff)
• tests/phpunit/tests/canonical.php (modified) (2 diffs)
• tests/phpunit/tests/canonical/postStatus.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

@@ -557 +557 @@
         // 5.8.0
         'wp_force_deactivated_plugins'    => array(),
+
+        // 6.4.0
+        'wp_attachment_pages_enabled'     => 0,
     );
 

trunk/src/wp-admin/includes/upgrade.php

@@ -840 +840 @@
     }
 
+    if ( $wp_current_db_version < 56657 ) {
+        upgrade_640();
+    }
+
     maybe_disable_link_manager();
 
@@ -2324 +2328 @@
 
 /**
+ * Executes changes made in WordPress 6.4.0.
+ *
+ * @ignore
+ * @since 6.4.0
+ *
+ * @global int $wp_current_db_version The old (current) database version.
+ */
+function upgrade_640() {
+    global $wp_current_db_version;
+
+    if ( $wp_current_db_version < 56657 ) {
+        // Enable attachment pages.
+        update_option( 'wp_media_use_attachment_pages', 1 );
+    }
+}
+
+/**
  * Executes network-level upgrade routines.
  *

trunk/src/wp-includes/canonical.php

@@ -543 +543 @@
             wp_redirect( $redirect_url, 301 );
             die();
+        }
+    }
+
+    $is_attachment_redirect = false;
+
+    if ( is_attachment() && ! get_option( 'wp_attachment_pages_enabled' ) ) {
+        $attachment_id = get_query_var( 'attachment_id' );
+
+        if ( current_user_can( 'read_post', $attachment_id ) ) {
+            $redirect_url = wp_get_attachment_url( $attachment_id );
+
+            $is_attachment_redirect = true;
         }
     }
@@ -651 +663 @@
     // Trailing slashes.
     if ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks()
+        && ! $is_attachment_redirect
         && ! is_404() && ( ! is_front_page() || is_front_page() && get_query_var( 'paged' ) > 1 )
     ) {

trunk/src/wp-includes/version.php

@@ -24 +24 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 55853;
+$wp_db_version = 56657;
 
 /**

trunk/tests/phpunit/tests/canonical.php

@@ -14 +14 @@
         parent::set_up();
         wp_set_current_user( self::$author_id );
+
+        add_filter( 'pre_option_wp_attachment_pages_enabled', '__return_true' );
     }
 
@@ -403 +405 @@
         $this->assertNull( $url );
     }
+
+    /**
+     * @ticket 57913
+     */
+    public function test_canonical_attachment_page_redirect_with_option_disabled() {
+        add_filter( 'pre_option_wp_attachment_pages_enabled', '__return_false' );
+
+        $filename = DIR_TESTDATA . '/images/test-image.jpg';
+        $contents = file_get_contents( $filename );
+        $upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
+
+        $attachment_id   = $this->_make_attachment( $upload );
+        $attachment_page = get_permalink( $attachment_id );
+
+        $this->go_to( $attachment_page );
+
+        $url      = redirect_canonical( $attachment_page, false );
+        $expected = wp_get_attachment_url( $attachment_id );
+
+        $this->assertSame( $expected, $url );
+    }
 }

trunk/tests/phpunit/tests/canonical/postStatus.php

@@ -170 +170 @@
         parent::set_up();
         self::setup_custom_types();
+
+        add_filter( 'pre_option_wp_attachment_pages_enabled', '__return_true' );
     }