Changeset 5369 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.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/wporg-bbp-user-badges/inc/class-plugin.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php

@@ -348 +348 @@
          */
         public function is_user_author( $user_nicename, $type, $slug ) {
-                if ( 'plugin' === $type ) {
-                        $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
+                if ( class_exists( '\WordPressdotorg\Forums\Plugin' ) ) {
+                        if ( 'plugin' === $type ) {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->plugins;
+                        } else {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->themes;
+                        }
                 } else {
-                        $compat = class_exists( '\WordPressdotorg\Forums\Theme' ) ? \WordPressdotorg\Forums\Theme::get_instance()->themes : '';
-                }
+                        $compat = null;
+                }
+
                 $authors = $compat ? $compat->get_authors( $slug ) : array();
 
@@ -370 +375 @@
          */
         public function is_user_contributor( $user_nicename, $type, $slug ) {
-                if ( 'plugin' === $type ) {
-                        $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
+                if ( class_exists( '\WordPressdotorg\Forums\Plugin' ) ) {
+                        if ( 'plugin' === $type ) {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->plugins;
+                        } else {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->themes;
+                        }
                 } else {
-                        $compat = class_exists( '\WordPressdotorg\Forums\Theme' ) ? \WordPressdotorg\Forums\Theme::get_instance()->themes : '';
-                }
+                        $compat = null;
+                }
+
                 $contributors = $compat ? $compat->get_contributors( $slug ) : array();