Changeset 12575

Timestamp:

05/08/2023 02:52:06 AM (19 months ago)

Author:

dd32

Message:

Support Forums: Also Viewing: Handle Localised forums which do not have plugin/theme forums.

See [12574].
See #6431.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php

@@ -309 +309 @@
     foreach ( $users as &$u ) {
         $user_objects = get_user_object_slugs( $u['user_id'] );
-        if ( ! array_intersect( $user_objects, $current_user_objects ) ) {
+        if ( ! array_intersect( $current_user_objects, $user_objects ) ) {
             $u['who']     = '';
             $u['user_id'] = 0;
@@ -329 +329 @@
     }
 
-    $plugin_slugs = \WordPressdotorg\Forums\Plugin::get_instance()->plugins->get_user_object_slugs( $user_id );
-    $theme_slugs  = \WordPressdotorg\Forums\Plugin::get_instance()->themes->get_user_object_slugs( $user_id );
+    $forums = \WordPressdotorg\Forums\Plugin::get_instance();
+    if ( ! $forums->plugins || ! $forums->themes ) {
+        return [];
+    }
+
+    $plugin_slugs = $forums->plugins->get_user_object_slugs( $user_id );
+    $theme_slugs  = $forums->themes->get_user_object_slugs( $user_id );
 
     $matrix = [];