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

Timestamp:

04/19/2017 06:31:54 PM (9 years ago)

Author:

ocean90

Message:

Support Forums, User Badges: Ensure that caches aren't polluted with empty arrays.

On some pages $this->plugin was empty and caused Trying to get property of non-object PHP notices.

Props SergeyBiryukov.
Fixes #2710.

File:

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

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

@@ -838 +838 @@
 
             if ( $this->compat() == 'theme' ) {
-                $theme = $this->theme;
-                $author = get_user_by( 'id', $this->theme->post_author );
+                $theme = $this->get_object( $slug );
+                $author = get_user_by( 'id', $theme->post_author );
                 $authors = array( $author->user_nicename );
             } else {
+                $plugin = $this->get_object( $slug );
                 $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
                 // Note: Intentionally not considering posts of 'plugin' post_type with
@@ -853 +854 @@
                      LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
                      WHERE tt.taxonomy = 'plugin_committers' AND tr.object_id = %d",
-                     $this->plugin->ID
+                     $plugin->ID
                 ) );
             }
@@ -880 +881 @@
         $contributors = wp_cache_get( $cache_key, $cache_group );
         if ( ! $contributors ) {
+            $plugin = $this->get_object( $slug );
             $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
             $contributors = $wpdb->get_col( $wpdb->prepare(
@@ -887 +889 @@
                  LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
                  WHERE tt.taxonomy = 'plugin_contributors' AND tr.object_id = %d",
-                 $this->plugin->ID
+                 $plugin->ID
             ) );