Changeset 8634 for sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

Timestamp:

04/12/2019 07:09:13 AM (6 years ago)

Author:

dd32

Message:

Support Forums: Fix a fatal error which could be encountered in [8620] under some rare conditions.

See #4342.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -294 +294 @@
             if ( ! $this->term && $this->get_object( $this->slug() ) ) {
                 $term = wp_insert_term( $this->slug(), $this->taxonomy() );
-                $this->term = get_term( $term['term_id'] );
+
+                // Term exists already? Race-condition, or get_term_by() couldn't find $slug..
+                if ( is_wp_error( $term ) && $term->get_error_data( 'term_exists' ) ) {
+                    $this->term = get_term( $term->get_error_data( 'term_exists' ) );
+                } elseif ( isset( $term['term_id'] ) ) {
+                    $this->term = get_term( $term['term_id'] );
+                }
             }
 
@@ -749 +755 @@
 
         $term_subscription = '';
-        if ( ! $this->term && $this->get_object( $this->slug() ) ) {
-            // New compats won't have any support topics or reviews, so will
-            // not yet exist as a compat term.
-            $term = wp_insert_term( $this->slug(), $this->taxonomy() );
-            $this->term = get_term( $term['term_id'] );
-        }
         if ( $this->term ) {
             $subscribe = $unsubscribe = '';