Changeset 4606

Timestamp:

07/04/2011 06:25:07 PM (15 years ago)

Author:

johnjamesjacoby

Message:

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

Location:

trunk

Files:

• bp-members/bp-members-actions.php (modified) (6 diffs)
• bp-members/bp-members-signup.php (modified) (7 diffs)
• bp-settings/bp-settings-actions.php (modified) (3 diffs)

trunk/bp-members/bp-members-actions.php

@@ -25 +25 @@
  * @global object $bp Global BuddyPress settings object
  */
-function bp_members_action_set_spammer_status() {
+function bp_core_action_set_spammer_status() {
         global $bp, $wpdb, $wp_version;
 
@@ -77 +77 @@
                         do_action( 'bp_make_ham_user',  $bp->displayed_user->id );
 
-                do_action( 'bp_members_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
+                do_action( 'bp_core_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
                 bp_core_redirect( wp_get_referer() );
         }
 }
-add_action( 'bp_actions', 'bp_members_action_set_spammer_status' );
+add_action( 'bp_actions', 'bp_core_action_set_spammer_status' );
 
 /**
@@ -89 +89 @@
  * @global object $bp Global BuddyPress settings object
  */
-function bp_members_action_delete_user() {
+function bp_core_action_delete_user() {
         global $bp;
 
@@ -100 +100 @@
 
                 $errors = false;
-                do_action( 'bp_members_before_action_delete_user', $errors );
+                do_action( 'bp_core_before_action_delete_user', $errors );
 
                 if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
@@ -109 +109 @@
                 }
 
-                do_action( 'bp_members_action_delete_user', $errors );
+                do_action( 'bp_core_action_delete_user', $errors );
 
                 if ( $errors )
@@ -117 +117 @@
         }
 }
-add_action( 'bp_actions', 'bp_members_action_delete_user' );
+add_action( 'bp_actions', 'bp_core_action_delete_user' );
 
 /**

trunk/bp-members/bp-members-signup.php

@@ -161 +161 @@
 
         do_action( 'bp_core_screen_signup' );
-        bp_core_load_template( apply_filters( 'bp_members_template_register', 'registration/register' ) );
+        bp_core_load_template( apply_filters( 'bp_core_template_register', 'registration/register' ) );
 }
 add_action( 'bp_screens', 'bp_core_screen_signup' );
@@ -175 +175 @@
 
                 // Activate the signup
-                $user = apply_filters( 'bp_members_activate_account', bp_core_activate_signup( $_GET['key'] ) );
+                $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
 
                 // If there were errors, add a message and redirect
@@ -276 +276 @@
 
         // Add our slugs to the array and allow them to be filtered
-        $filtered_illegal_names = apply_filters( 'bp_members_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
+        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
 
         // Merge the arrays together
@@ -417 +417 @@
          * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
          *
-         * To disable sending activation emails you can user the filter 'bp_members_signup_send_activation_key' and return false.
+         * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
          */
-        if ( apply_filters( 'bp_members_signup_send_activation_key', true ) ) {
+        if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
                 if ( !is_multisite() ) {
                         $activation_key = wp_hash( $user_id );
@@ -497 +497 @@
         wp_cache_delete( 'bp_total_member_count', 'bp' );
 
-        do_action( 'bp_members_activated_user', $user_id, $key, $user );
+        do_action( 'bp_core_activated_user', $user_id, $key, $user );
 
         return $user_id;
@@ -518 +518 @@
         bp_activity_add( array(
                 'user_id'   => $user_id,
-                'action'    => apply_filters( 'bp_members_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
+                'action'    => apply_filters( 'bp_core_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
                 'component' => 'xprofile',
                 'type'      => 'new_member'
         ) );
 }
-add_action( 'bp_members_activated_user', 'bp_core_new_user_activity' );
+add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
 
 function bp_core_map_user_registration( $user_id ) {
@@ -579 +579 @@
         wp_mail( $to, $subject, $message );
 
-        do_action( 'bp_members_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
+        do_action( 'bp_core_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
 }
 

trunk/bp-settings/bp-settings-actions.php

@@ -107 +107 @@
 
         // Load the template
-        bp_core_load_template( apply_filters( 'bp_members_template_settings', 'members/single/settings/general' ) );
+        bp_core_load_template( apply_filters( 'bp_core_screen_general_settings', 'members/single/settings/general' ) );
 }
 
@@ -135 +135 @@
         }
 
-        bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/settings/notifications' ) );
+        bp_core_load_template( apply_filters( 'bp_core_screen_notification_settings', 'members/single/settings/notifications' ) );
 }
 
@@ -159 +159 @@
 
         // Load the template
-        bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/settings/delete-account' ) );
+        bp_core_load_template( apply_filters( 'bp_core_screen_delete_account', 'members/single/settings/delete-account' ) );
 }