Changeset 12753 for trunk/src/bp-core/classes/class-bp-core.php

Timestamp:

10/15/2020 04:33:31 PM (4 years ago)

Author:

imath

Message:

Core: use only one global to store the Notifications DB table name

• Deprecate $bp->core->table_name_notifications.
• Add a magic getter to BP_Core, with a fallback if the Notifications component isn't active.
• Audit the related queries and method params, and makes sure they work as intended, and update them to our latest coding standards.

Props johnjamesjacoby

Fixes #8360

File:

• trunk/src/bp-core/classes/class-bp-core.php (modified) (2 diffs)

trunk/src/bp-core/classes/class-bp-core.php

@@ -37 +37 @@
 
     /**
+     * Magic getter.
+     *
+     * This exists specifically for supporting deprecated object vars.
+     *
+     * @since 7.0.0
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function __get( $key = '' ) {
+
+        // Backwards compatibility for the original Notifications table var
+        if ( 'table_name_notifications' === $key ) {
+            return bp_is_active( 'notifications' )
+                ? buddypress()->notifications->table_name
+                : buddypress()->table_prefix . 'bp_notifications';
+        }
+
+        // Return object var if set, else null
+        return isset( $this->{$key} )
+            ? $this->{$key}
+            : null;
+    }
+
+    /**
      * Populate the global data needed before BuddyPress can continue.
      *
@@ -249 +274 @@
          */
         $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default',  $bp->grav_default->user );
-
-        // Notifications table. Included here for legacy purposes. Use
-        // bp-notifications instead.
-        $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
         // Backward compatibility for plugins modifying the legacy bp_nav and bp_options_nav global properties.