Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/02/2009 07:54:21 PM (17 years ago)
Author:
apeatling
Message:

Merging 1.1 branch changes and syncing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups/bp-groups-filters.php

    r2026 r2077  
    6161function groups_add_forum_privacy_sql() {
    6262        global $bp;
    63        
     63
    6464        /* Only filter the forum SQL on group pages or on the forums directory */
    6565        if ( ( $bp->groups->current_group && 'public' == $bp->groups->current_group->status ) || bp_is_directory() ) {
     
    8282function groups_add_forum_where_sql( $sql ) {
    8383        global $bp;
    84        
     84
    8585        $bp->groups->filter_sql = ' AND ' . $sql;
    8686        return "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND g.status = 'public' AND " . $sql;
     
    9292        if ( is_site_admin() )
    9393                return true;
    94        
     94
    9595        if ( 'add_tag_to' == $cap )
    9696                if ( $bp->groups->current_group->user_has_access ) return true;
    97        
     97
    9898        if ( 'manage_forums' == $cap && is_user_logged_in() )
    9999                return true;
    100        
     100
    101101        return $value;
    102102}
Note: See TracChangeset for help on using the changeset viewer.