Changeset 13087 for trunk/src/bp-groups/classes/class-bp-groups-component.php

Timestamp:

08/22/2021 04:47:17 PM (5 years ago)

Author:

imath

Message:

Add a new method to the Members & Groups components main class

BP_Members_Component::setup_additional_globals() & BP_Groups_Component::setup_additional_globals() are used to set specific components globals that are not passed to BP_Component::setup_globals(). This commit also makes sure the BP Nouveau template pack uses a consistent object ID for its directory navigation.

Fixes #8555

File:

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

trunk/src/bp-groups/classes/class-bp-groups-component.php

@@ -216 +216 @@
 
         /**
-         * Set up component global data.
-         *
-         * The BP_GROUPS_SLUG constant is deprecated, and only used here for
-         * backwards compatibility.
-         *
-         * @since 1.5.0
-         *
-         * @see BP_Component::setup_globals() for a description of arguments.
-         *
-         * @param array $args See BP_Component::setup_globals() for a description.
-         */
-        public function setup_globals( $args = array() ) {
+         * Set up additional globals for the component.
+         *
+         * @since 10.0.0
+         */
+        public function setup_additional_globals() {
                 $bp = buddypress();
-
-                // Define a slug, if necessary.
-                if ( ! defined( 'BP_GROUPS_SLUG' ) ) {
-                        define( 'BP_GROUPS_SLUG', $this->id );
-                }
-
-                // Global tables for groups component.
-                $global_tables = array(
-                        'table_name'           => $bp->table_prefix . 'bp_groups',
-                        'table_name_members'   => $bp->table_prefix . 'bp_groups_members',
-                        'table_name_groupmeta' => $bp->table_prefix . 'bp_groups_groupmeta'
-                );
-
-                // Metadata tables for groups component.
-                $meta_tables = array(
-                        'group' => $bp->table_prefix . 'bp_groups_groupmeta',
-                );
-
-                // Fetch the default directory title.
-                $default_directory_titles = bp_core_get_directory_page_default_titles();
-                $default_directory_title  = $default_directory_titles[$this->id];
-
-                // All globals for groups component.
-                // Note that global_tables is included in this array.
-                $args = array(
-                        'slug'                  => BP_GROUPS_SLUG,
-                        'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
-                        'has_directory'         => true,
-                        'directory_title'       => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : $default_directory_title,
-                        'notification_callback' => 'groups_format_notifications',
-                        'search_string'         => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
-                        'global_tables'         => $global_tables,
-                        'meta_tables'           => $meta_tables,
-                        'block_globals'         => array(
-                                'bp/dynamic-groups' => array(
-                                        'widget_classnames' => array( 'widget_bp_groups_widget', 'buddypress' ),
-                                ),
-                        ),
-                );
-
-                parent::setup_globals( $args );
 
                 /* Single Group Globals **********************************************/
@@ -442 +394 @@
                 // Auto join group when non group member performs group activity.
                 $this->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) && BP_DISABLE_AUTO_GROUP_JOIN ? false : true;
+        }
+
+        /**
+         * Set up component global data.
+         *
+         * The BP_GROUPS_SLUG constant is deprecated, and only used here for
+         * backwards compatibility.
+         *
+         * @since 1.5.0
+         *
+         * @see BP_Component::setup_globals() for a description of arguments.
+         *
+         * @param array $args See BP_Component::setup_globals() for a description.
+         */
+        public function setup_globals( $args = array() ) {
+                $bp = buddypress();
+
+                // Define a slug, if necessary.
+                if ( ! defined( 'BP_GROUPS_SLUG' ) ) {
+                        define( 'BP_GROUPS_SLUG', $this->id );
+                }
+
+                // Global tables for groups component.
+                $global_tables = array(
+                        'table_name'           => $bp->table_prefix . 'bp_groups',
+                        'table_name_members'   => $bp->table_prefix . 'bp_groups_members',
+                        'table_name_groupmeta' => $bp->table_prefix . 'bp_groups_groupmeta'
+                );
+
+                // Metadata tables for groups component.
+                $meta_tables = array(
+                        'group' => $bp->table_prefix . 'bp_groups_groupmeta',
+                );
+
+                // Fetch the default directory title.
+                $default_directory_titles = bp_core_get_directory_page_default_titles();
+                $default_directory_title  = $default_directory_titles[$this->id];
+
+                // All globals for groups component.
+                // Note that global_tables is included in this array.
+                $args = array(
+                        'slug'                  => BP_GROUPS_SLUG,
+                        'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
+                        'has_directory'         => true,
+                        'directory_title'       => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : $default_directory_title,
+                        'notification_callback' => 'groups_format_notifications',
+                        'search_string'         => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
+                        'global_tables'         => $global_tables,
+                        'meta_tables'           => $meta_tables,
+                        'block_globals'         => array(
+                                'bp/dynamic-groups' => array(
+                                        'widget_classnames' => array( 'widget_bp_groups_widget', 'buddypress' ),
+                                ),
+                        ),
+                );
+
+                parent::setup_globals( $args );
+
+                // Additional globals.
+                $this->setup_additional_globals();
         }