<!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][4259] trunk: No need to include registration.php; file was merged with user.php in WP 3.1.</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>4259</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-23 17:28:06 +0000 (Sat, 23 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>No need to include registration.php; file was merged with user.php in WP 3.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.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="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (4258 => 4259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-04-23 17:04:59 UTC (rev 4258)
+++ trunk/bp-activity/bp-activity-filters.php 2011-04-23 17:28:06 UTC (rev 4259)
</span><span class="lines">@@ -113,9 +113,6 @@
</span><span class="cx"> * @param string $content The activity content
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_at_name_filter( $content ) {
</span><del>- if ( ! function_exists( 'username_exists' ) )
- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> $usernames = bp_activity_find_mentions( $content );
</span><span class="cx">
</span><span class="cx"> foreach( (array)$usernames as $username ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (4258 => 4259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-04-23 17:04:59 UTC (rev 4258)
+++ trunk/bp-activity/bp-activity-functions.php 2011-04-23 17:28:06 UTC (rev 4259)
</span><span class="lines">@@ -41,9 +41,6 @@
</span><span class="cx"> $activity = new BP_Activity_Activity( $activity_id );
</span><span class="cx">
</span><span class="cx"> if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
</span><del>- if ( ! function_exists( 'username_exists' ) )
- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> foreach( (array)$usernames as $username ) {
</span><span class="cx"> if ( !$user_id = username_exists( $username ) )
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (4258 => 4259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-04-23 17:04:59 UTC (rev 4258)
+++ trunk/bp-members/bp-members-signup.php 2011-04-23 17:28:06 UTC (rev 4259)
</span><span class="lines">@@ -295,9 +295,6 @@
</span><span class="cx"> function bp_members_validate_user_signup( $user_name, $user_email ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( ! function_exists( 'validate_username' ) )
- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> $errors = new WP_Error();
</span><span class="cx"> $user_email = sanitize_email( $user_email );
</span><span class="cx">
</span><span class="lines">@@ -376,9 +373,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx">
</span><del>- if ( ! function_exists( 'wp_insert_user' ) )
- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> $user_id = wp_insert_user( array(
</span><span class="cx"> 'user_login' => $user_login,
</span><span class="cx"> 'user_pass' => $user_password,
</span><span class="lines">@@ -485,8 +479,6 @@
</span><span class="cx"> delete_user_meta( $user_id, 'activation_key' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> // Update the display_name
</span><span class="cx"> wp_update_user( array( 'ID' => $user_id, 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-actions.php (4258 => 4259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-actions.php 2011-04-23 17:04:59 UTC (rev 4258)
+++ trunk/bp-settings/bp-settings-actions.php 2011-04-23 17:28:06 UTC (rev 4259)
</span><span class="lines">@@ -14,9 +14,6 @@
</span><span class="cx"> // Nonce check
</span><span class="cx"> check_admin_referer('bp_settings_general');
</span><span class="cx">
</span><del>- if ( ! function_exists( 'email_exists' ) )
- require_once( ABSPATH . WPINC . '/registration.php' );
-
</del><span class="cx"> // Validate the user again for the current password when making a big change
</span><span class="cx"> if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>