Changeset 54785

Timestamp:

11/10/2022 02:59:56 AM (21 months ago)

Author:

peterwilsoncc

Message:

Canonical: Protect against error for term not exists queries.

Prevent term NOT EXISTS queries causing redirect_canonical() to throw a fatal error in PHP 8 and above, or a warning in earlier versions.

This ensures the tax_query's terms property both exists and is countable before attempting to count it.

Props codesdnc, SergeyBiryukov, kadamwhite, costdev, miguelaxcar.
Fixes #55955.

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

@@ -332 +332 @@
 
             foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {
-                $term_count += count( $tax_query['terms'] );
+                if ( isset( $tax_query['terms'] ) && is_countable( $tax_query['terms'] ) ) {
+                    $term_count += count( $tax_query['terms'] );
+                }
             }
 

trunk/tests/phpunit/tests/canonical.php

@@ -376 +376 @@
         delete_option( 'page_on_front' );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }