Changeset 50565

Timestamp:

03/23/2021 01:53:50 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Use a consistent check for the $rewrite['hierarchical'] parameter.

This avoids a "Trying to access array offset on value of type bool" PHP warning in get_term_link() if the $rewrite parameter of register_taxonomy() is set as false.

Props Tkama, SergeyBiryukov.
Fixes #52882.

Location:

trunk

Files:

• src/wp-includes/class-wp-query.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/getTermLink.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-query.php

@@ -1119 +1119 @@
                                 );
 
-                                if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
+                                if ( ! empty( $t->rewrite['hierarchical'] ) ) {
                                         $q[ $t->query_var ] = wp_basename( $q[ $t->query_var ] );
                                 }

trunk/src/wp-includes/taxonomy.php

@@ -4476 +4476 @@
                 $termlink = home_url( $termlink );
         } else {
-                if ( $t->rewrite['hierarchical'] ) {
+                if ( ! empty( $t->rewrite['hierarchical'] ) ) {
                         $hierarchical_slugs = array();
                         $ancestors          = get_ancestors( $term->term_id, $taxonomy, 'taxonomy' );

trunk/tests/phpunit/tests/term/getTermLink.php

@@ -103 +103 @@
                 $this->assertContains( 'taxonomy=wptests_tax2', $actual );
                 $this->assertContains( 'term=bar', $actual );
+        }
+
+        /**
+         * @ticket 52882
+         */
+        public function test_taxonomy_with_rewrite_false_and_custom_permalink_structure() {
+                $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
+                register_taxonomy(
+                        'wptests_tax2',
+                        'post',
+                        array(
+                                'rewrite' => false,
+                        )
+                );
+
+                add_permastruct( 'wptests_tax2', 'foo/%wptests_tax2%' );
+
+                $t = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax2',
+                                'slug'     => 'bar',
+                        )
+                );
+
+                $actual = get_term_link( $t, 'wptests_tax2' );
+
+                remove_permastruct( 'wptests_tax2' );
+
+                $this->assertContains( '/foo/bar/', $actual );
         }