<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4606] trunk: Second pass at reverting members/core function & filter refactor.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4606</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-04 18:25:07 +0000 (Mon, 04 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Second pass at reverting members/core function & filter refactor. See #3158.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunkbpmembersbpmemberssignupphp">trunk/bp-members/bp-members-signup.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsactionsphp">trunk/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (4605 => 4606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2011-07-04 17:50:22 UTC (rev 4605)
+++ trunk/bp-members/bp-members-actions.php 2011-07-04 18:25:07 UTC (rev 4606)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @global object $bp Global BuddyPress settings object
</span><span class="cx"> */
</span><del>-function bp_members_action_set_spammer_status() {
</del><ins>+function bp_core_action_set_spammer_status() {
</ins><span class="cx"> global $bp, $wpdb, $wp_version;
</span><span class="cx">
</span><span class="cx"> if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
</span><span class="lines">@@ -76,11 +76,11 @@
</span><span class="cx"> else
</span><span class="cx"> do_action( 'bp_make_ham_user', $bp->displayed_user->id );
</span><span class="cx">
</span><del>- do_action( 'bp_members_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
</del><ins>+ do_action( 'bp_core_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
</ins><span class="cx"> bp_core_redirect( wp_get_referer() );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'bp_actions', 'bp_members_action_set_spammer_status' );
</del><ins>+add_action( 'bp_actions', 'bp_core_action_set_spammer_status' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Allows a site admin to delete a user from the adminbar menu.
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @global object $bp Global BuddyPress settings object
</span><span class="cx"> */
</span><del>-function bp_members_action_delete_user() {
</del><ins>+function bp_core_action_delete_user() {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> check_admin_referer( 'delete-user' );
</span><span class="cx">
</span><span class="cx"> $errors = false;
</span><del>- do_action( 'bp_members_before_action_delete_user', $errors );
</del><ins>+ do_action( 'bp_core_before_action_delete_user', $errors );
</ins><span class="cx">
</span><span class="cx"> if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
</span><span class="cx"> bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), $bp->displayed_user->fullname ) );
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> $errors = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- do_action( 'bp_members_action_delete_user', $errors );
</del><ins>+ do_action( 'bp_core_action_delete_user', $errors );
</ins><span class="cx">
</span><span class="cx"> if ( $errors )
</span><span class="cx"> bp_core_redirect( $bp->displayed_user->domain );
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> bp_core_redirect( $bp->loggedin_user->domain );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'bp_actions', 'bp_members_action_delete_user' );
</del><ins>+add_action( 'bp_actions', 'bp_core_action_delete_user' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns the user_id for a user based on their username.
</span></span></pre></div>
<a id="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (4605 => 4606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-07-04 17:50:22 UTC (rev 4605)
+++ trunk/bp-members/bp-members-signup.php 2011-07-04 18:25:07 UTC (rev 4606)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_core_screen_signup' );
</span><del>- bp_core_load_template( apply_filters( 'bp_members_template_register', 'registration/register' ) );
</del><ins>+ bp_core_load_template( apply_filters( 'bp_core_template_register', 'registration/register' ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_screens', 'bp_core_screen_signup' );
</span><span class="cx">
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if ( isset( $_GET['key'] ) ) {
</span><span class="cx">
</span><span class="cx"> // Activate the signup
</span><del>- $user = apply_filters( 'bp_members_activate_account', bp_core_activate_signup( $_GET['key'] ) );
</del><ins>+ $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
</ins><span class="cx">
</span><span class="cx"> // If there were errors, add a message and redirect
</span><span class="cx"> if ( !empty( $user->errors ) ) {
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> $bp_component_slugs[] = constant( $constant );
</span><span class="cx">
</span><span class="cx"> // Add our slugs to the array and allow them to be filtered
</span><del>- $filtered_illegal_names = apply_filters( 'bp_members_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
</del><ins>+ $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
</ins><span class="cx">
</span><span class="cx"> // Merge the arrays together
</span><span class="cx"> $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
</span><span class="lines">@@ -416,9 +416,9 @@
</span><span class="cx"> * Now generate an activation key and send an email to the user so they can activate their account
</span><span class="cx"> * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
</span><span class="cx"> *
</span><del>- * To disable sending activation emails you can user the filter 'bp_members_signup_send_activation_key' and return false.
</del><ins>+ * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
</ins><span class="cx"> */
</span><del>- if ( apply_filters( 'bp_members_signup_send_activation_key', true ) ) {
</del><ins>+ if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
</ins><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $activation_key = wp_hash( $user_id );
</span><span class="cx"> update_user_meta( $user_id, 'activation_key', $activation_key );
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> // Delete the total member cache
</span><span class="cx"> wp_cache_delete( 'bp_total_member_count', 'bp' );
</span><span class="cx">
</span><del>- do_action( 'bp_members_activated_user', $user_id, $key, $user );
</del><ins>+ do_action( 'bp_core_activated_user', $user_id, $key, $user );
</ins><span class="cx">
</span><span class="cx"> return $user_id;
</span><span class="cx"> }
</span><span class="lines">@@ -517,12 +517,12 @@
</span><span class="cx">
</span><span class="cx"> bp_activity_add( array(
</span><span class="cx"> 'user_id' => $user_id,
</span><del>- 'action' => apply_filters( 'bp_members_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
</del><ins>+ 'action' => apply_filters( 'bp_core_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
</ins><span class="cx"> 'component' => 'xprofile',
</span><span class="cx"> 'type' => 'new_member'
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-add_action( 'bp_members_activated_user', 'bp_core_new_user_activity' );
</del><ins>+add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
</ins><span class="cx">
</span><span class="cx"> function bp_core_map_user_registration( $user_id ) {
</span><span class="cx"> // Only map data when the site admin is adding users, not on registration.
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><del>- do_action( 'bp_members_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
</del><ins>+ do_action( 'bp_core_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Stop user accounts logging in that have not been activated (user_status = 2)
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-actions.php (4605 => 4606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-actions.php 2011-07-04 17:50:22 UTC (rev 4605)
+++ trunk/bp-settings/bp-settings-actions.php 2011-07-04 18:25:07 UTC (rev 4606)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Load the template
</span><del>- bp_core_load_template( apply_filters( 'bp_members_template_settings', 'members/single/settings/general' ) );
</del><ins>+ bp_core_load_template( apply_filters( 'bp_core_screen_general_settings', 'members/single/settings/general' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Notifications *************************************************************/
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> do_action( 'bp_core_notification_settings_after_save' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/settings/notifications' ) );
</del><ins>+ bp_core_load_template( apply_filters( 'bp_core_screen_notification_settings', 'members/single/settings/notifications' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Delete Account ************************************************************/
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Load the template
</span><del>- bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/settings/delete-account' ) );
</del><ins>+ bp_core_load_template( apply_filters( 'bp_core_screen_delete_account', 'members/single/settings/delete-account' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>