Changeset 49200

Timestamp:

10/18/2020 11:21:03 PM (4 years ago)

Author:

peterwilsoncc

Message:

Canonical: Support multiple post types in redirect_guess_404_permalink().

Prevent redirect_guess_404_permalink() from throwing a notice when multiple post types are included in the post_type query.

Props junaidbhura.
Fixes #43056.

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

@@ -896 +896 @@
         // If any of post_type, year, monthnum, or day are set, use them to refine the query.
         if ( get_query_var( 'post_type' ) ) {
-            $where .= $wpdb->prepare( ' AND post_type = %s', get_query_var( 'post_type' ) );
+            if ( is_array( get_query_var( 'post_type' ) ) ) {
+                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
+                $where .= " AND post_type IN ('" . join( "', '", esc_sql( get_query_var( 'post_type' ) ) ) . "')";
+            } else {
+                $where .= $wpdb->prepare( ' AND post_type = %s', get_query_var( 'post_type' ) );
+            }
         } else {
             $where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";

trunk/tests/phpunit/tests/canonical.php

@@ -277 +277 @@
 
     /**
+     * Ensure multiple post types do not throw a notice.
+     *
+     * @ticket 43056
+     */
+    public function test_redirect_guess_404_permalink_post_types() {
+        /*
+         * Sample-page is intentionally missspelt as sample-pag to ensure
+         * the 404 post permalink guessing runs.
+         *
+         * Please do not correct the apparent typo.
+         */
+
+        // String format post type.
+        $this->assertCanonical( '/?name=sample-pag&post_type=page', '/sample-page/' );
+        // Array formatted post type or types.
+        $this->assertCanonical( '/?name=sample-pag&post_type[]=page', '/sample-page/' );
+        $this->assertCanonical( '/?name=sample-pag&post_type[]=page&post_type[]=post', '/sample-page/' );
+    }
+
+    /**
      * @ticket 43745
      */