Changeset 5689 for trunk/bp-groups/bp-groups-filters.php

Timestamp:

02/10/2012 01:17:51 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Groups component. See #3989.

File:

• trunk/bp-groups/bp-groups-filters.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-filters.php

@@ -57 +57 @@
     $groups_allowedtags['img']['id']     = array();
     $groups_allowedtags['code']          = array();
+    $groups_allowedtags = apply_filters( 'bp_groups_filter_kses', $groups_allowedtags );
 
-    $groups_allowedtags = apply_filters( 'bp_groups_filter_kses', $groups_allowedtags );
     return wp_kses( $content, $groups_allowedtags );
 }
 
-/**** Filters for group forums ****/
+/** Group forums **************************************************************/
 
+/**
+ * Only filter the forum SQL on group pages or on the forums directory 
+ */
 function groups_add_forum_privacy_sql() {
-    global $bp;
-
-    // Only filter the forum SQL on group pages or on the forums directory
-    add_filter( 'get_topics_fields',     'groups_add_forum_fields_sql' );
-    add_filter( 'get_topics_join',       'groups_add_forum_tables_sql' );
-    add_filter( 'get_topics_where',      'groups_add_forum_where_sql'  );
+    add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
+    add_filter( 'get_topics_join',   'groups_add_forum_tables_sql' );
+    add_filter( 'get_topics_where',  'groups_add_forum_where_sql'  );
 }
 add_filter( 'bbpress_init', 'groups_add_forum_privacy_sql' );
 
 function groups_add_forum_fields_sql( $sql = '' ) {
-    return 't.*, g.id as object_id, g.name as object_name, g.slug as object_slug';
+    $sql = 't.*, g.id as object_id, g.name as object_name, g.slug as object_slug';
+    return $sql;
 }
 
@@ -88 +89 @@
 function groups_add_forum_where_sql( $sql = '' ) {
     global $bp;
+
+    // Define locale variable
+    $parts = array();
 
     // Set this for groups
@@ -153 +157 @@
 }
 add_filter( 'get_latest_topics_fields', 'groups_filter_forums_root_page_sql' );
+
 ?>