Changeset 11162

Timestamp:

09/28/2016 01:23:31 AM (9 years ago)

Author:

dcavins

Message:

BP Groups Admin Types: Correct variable usage.

Reorganize the logic in
BP_Groups_List_Table::column_content_group_type()
to ensure that the output variable exists before we
attempt to apply filters to it.

Props mercime.

See #7175.

File:

• trunk/src/bp-groups/classes/class-bp-groups-list-table.php (modified) (3 diffs)

trunk/src/bp-groups/classes/class-bp-groups-list-table.php

@@ -711 +711 @@
      * @param array  $item        The current group item in the loop.
      */
-    public function column_content_group_type( $retval, $column_name, $item ) {
+    public function column_content_group_type( $retval = '', $column_name, $item ) {
         if ( 'bp_group_type' !== $column_name ) {
             return $retval;
@@ -722 +722 @@
         if ( $type_obj = bp_groups_get_group_type_object( $type ) ) {
             $url         = add_query_arg( array( 'bp-group-type' => urlencode( $type ) ) );
-            $type_string = '<a href="' . esc_url( $url ) . '">' . esc_html( $type_obj->labels['singular_name'] ) . '</a>';
+            $retval = '<a href="' . esc_url( $url ) . '">' . esc_html( $type_obj->labels['singular_name'] ) . '</a>';
         }
 
@@ -730 +730 @@
          * @since 2.7.0
          *
-         * @param string $type_string Markup for the Group Type column.
-         * @parma array  $item        The current group item in the loop.
-         */
-        echo apply_filters_ref_array( 'bp_groups_admin_get_group_type_column', array( $type_string, $item ) );
+         * @param string $retval Markup for the Group Type column.
+         * @parma array  $item   The current group item in the loop.
+         */
+        echo apply_filters_ref_array( 'bp_groups_admin_get_group_type_column', array( $retval, $item ) );
     }