Skip to:
Content

BuddyPress.org

Changeset 2842 for trunk/bp-groups.php


Ignore:
Timestamp:
03/12/2010 01:03:42 PM (15 years ago)
Author:
apeatling
Message:

Merging 1.2 branch with trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups.php

    r2822 r2842  
    868868
    869869    if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
     870
     871        /* Ask for a login if the user is coming here via an email notification */
     872        if ( !is_user_logged_in() )
     873            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
    870874
    871875        if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
     
    18971901    groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
    18981902
    1899     do_action( 'groups_new_group_forum', $forum, $group_id );
     1903    do_action( 'groups_new_group_forum', $forum_id, $group_id );
    19001904}
    19011905
Note: See TracChangeset for help on using the changeset viewer.