Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
07/04/2011 06:25:07 PM (13 years ago)
Author:
johnjamesjacoby
Message:

Second pass at reverting members/core function & filter refactor. See #3158.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-members/bp-members-signup.php

    r4605 r4606  
    161161
    162162    do_action( 'bp_core_screen_signup' );
    163     bp_core_load_template( apply_filters( 'bp_members_template_register', 'registration/register' ) );
     163    bp_core_load_template( apply_filters( 'bp_core_template_register', 'registration/register' ) );
    164164}
    165165add_action( 'bp_screens', 'bp_core_screen_signup' );
     
    175175
    176176        // Activate the signup
    177         $user = apply_filters( 'bp_members_activate_account', bp_core_activate_signup( $_GET['key'] ) );
     177        $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
    178178
    179179        // If there were errors, add a message and redirect
     
    276276
    277277    // Add our slugs to the array and allow them to be filtered
    278     $filtered_illegal_names = apply_filters( 'bp_members_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
     278    $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
    279279
    280280    // Merge the arrays together
     
    417417     * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
    418418     *
    419      * To disable sending activation emails you can user the filter 'bp_members_signup_send_activation_key' and return false.
     419     * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
    420420     */
    421     if ( apply_filters( 'bp_members_signup_send_activation_key', true ) ) {
     421    if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
    422422        if ( !is_multisite() ) {
    423423            $activation_key = wp_hash( $user_id );
     
    497497    wp_cache_delete( 'bp_total_member_count', 'bp' );
    498498
    499     do_action( 'bp_members_activated_user', $user_id, $key, $user );
     499    do_action( 'bp_core_activated_user', $user_id, $key, $user );
    500500
    501501    return $user_id;
     
    518518    bp_activity_add( array(
    519519        'user_id'   => $user_id,
    520         'action'    => apply_filters( 'bp_members_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
     520        'action'    => apply_filters( 'bp_core_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
    521521        'component' => 'xprofile',
    522522        'type'      => 'new_member'
    523523    ) );
    524524}
    525 add_action( 'bp_members_activated_user', 'bp_core_new_user_activity' );
     525add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
    526526
    527527function bp_core_map_user_registration( $user_id ) {
     
    579579    wp_mail( $to, $subject, $message );
    580580
    581     do_action( 'bp_members_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
     581    do_action( 'bp_core_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
    582582}
    583583
Note: See TracChangeset for help on using the changeset viewer.