Changeset 53043

Timestamp:

04/01/2022 03:23:07 AM (3 years ago)

Author:

peterwilsoncc

Message:

Canonical: Include all public status in 404 redirects.

In redirect_guess_404_permalink() search for posts using all publicly queryable statuses rather than limiting options to the publish status.

Props goaroundagain, costdev, htdat, audrasjb, chaion07.
Fixes #47911.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/canonical.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -958 +958 @@
         }
 
+        $publicly_viewable_statuses = array_filter( get_post_stati(), 'is_post_status_viewable' );
         // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-        $post_id = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'" );
+        $post_id = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE $where AND post_status IN ('" . implode( "', '", esc_sql( $publicly_viewable_statuses ) ) . "')" );
 
         if ( ! $post_id ) {

trunk/tests/phpunit/tests/canonical.php

@@ -277 +277 @@
 
     /**
+     * Ensure public posts with custom public statuses are guessed.
+     *
+     * @ticket 47911
+     * @dataProvider data_redirect_guess_404_permalink_with_custom_statuses
+     *
+     * @covers ::redirect_guess_404_permalink
+     */
+    public function test_redirect_guess_404_permalink_with_custom_statuses( $status_args, $redirects ) {
+        register_post_status( 'custom', $status_args );
+
+        $post = self::factory()->post->create(
+            array(
+                'post_title'  => 'custom-status-public-guess-404-permalink',
+                'post_status' => 'custom',
+            )
+        );
+
+        $this->go_to( 'custom-status-public-guess-404-permalink' );
+
+        $expected = $redirects ? get_permalink( $post ) : false;
+
+        $this->assertSame( $expected, redirect_guess_404_permalink() );
+    }
+
+    /**
+     * Data provider for test_redirect_guess_404_permalink_with_custom_statuses().
+     *
+     * return array[] {
+     *    array Arguments used to register custom status
+     *    bool  Whether the 404 link is expected to redirect
+     * }
+     */
+    public function data_redirect_guess_404_permalink_with_custom_statuses() {
+        return array(
+            'public status'                      => array(
+                'status_args' => array( 'public' => true ),
+                'redirects'   => true,
+            ),
+            'private status'                     => array(
+                'status_args' => array( 'public' => false ),
+                'redirects'   => false,
+            ),
+            'internal status'                    => array(
+                'status_args' => array( 'internal' => true ),
+                'redirects'   => false,
+            ),
+            'protected status'                   => array(
+                'status_args' => array( 'protected' => true ),
+                'redirects'   => false,
+            ),
+            'protected status flagged as public' => array(
+                'status_args' => array(
+                    'protected' => true,
+                    'public'    => true,
+                ),
+                'redirects'   => false,
+            ),
+        );
+    }
+
+    /**
      * Ensure multiple post types do not throw a notice.
      *