Changeset 10775 for trunk/src/bp-groups/bp-groups-template.php

Timestamp:

05/17/2016 08:34:39 PM (10 years ago)

Author:

boonebgorges

Message:

Use bp_get_group_name() instead of redefining filter in various places.

Reduces code duplication, and ensures that changes to filter parameters are
automatically applied to every instance of the filter.

Props garrett-eclipse.
See #6752. Fixes #7069.

File:

• trunk/src/bp-groups/bp-groups-template.php (modified) (2 diffs)

trunk/src/bp-groups/bp-groups-template.php

@@ -5855 +5855 @@
          */
         function bp_get_current_group_name() {
-                $current_group      = groups_get_current_group();
-                $current_group_name = isset( $current_group->name ) ? $current_group->name : '';
-
-                /** This filter is documented in bp-groups/bp-groups-template.php */
-                $name               = apply_filters( 'bp_get_group_name', $current_group_name );
+                $current_group = groups_get_current_group();
+                $current_name  = bp_get_group_name( $current_group );
 
                 /**
@@ -5866 +5863 @@
                  * @since 1.2.0
                  *
-                 * @param string $name          Name of the current group.
+                 * @param string $current_name  Name of the current group.
                  * @param object $current_group Instance holding the current group.
                  */
-                return apply_filters( 'bp_get_current_group_name', $name, $current_group );
+                return apply_filters( 'bp_get_current_group_name', $current_name, $current_group );
         }