<!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][3666] trunk: Refactors registration.php requires so they don't require an additional function.</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>3666</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-01-06 15:17:09 +0000 (Thu, 06 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactors registration.php requires so they don't require an additional function. Fixes #2997. Props nacin</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcoresettingsphp">trunk/bp-core/bp-core-settings.php</a></li>
<li><a href="#trunkbpcorebpcoresignupphp">trunk/bp-core/bp-core-signup.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.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 (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-activity/bp-activity-filters.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -113,7 +113,8 @@
</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>- bp_core_maybe_include_user_registration_file();
</del><ins>+ if ( ! function_exists( 'username_exists' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
</ins><span class="cx">
</span><span class="cx"> $usernames = bp_activity_find_mentions( $content );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-activity.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -546,7 +546,8 @@
</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>- bp_core_maybe_include_user_registration_file();
</del><ins>+ if ( ! function_exists( 'username_exists' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
</ins><span class="cx">
</span><span class="cx"> foreach( (array)$usernames as $username ) {
</span><span class="cx"> if ( !$user_id = username_exists( $username ) )
</span></span></pre></div>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -325,8 +325,6 @@
</span><span class="cx"> global $current_user, $current_site;
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- bp_core_maybe_include_user_registration_file();
-
</del><span class="cx"> if ( isset($_POST['submit']) ) {
</span><span class="cx"> bp_blogs_validate_blog_signup();
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbpcorebpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-settings.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-settings.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-core/bp-core-settings.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -51,7 +51,8 @@
</span><span class="cx"> if ( isset($_POST['submit']) ) {
</span><span class="cx"> check_admin_referer('bp_settings_general');
</span><span class="cx">
</span><del>- bp_core_maybe_include_user_registration_file();
</del><ins>+ if ( ! function_exists( 'email_exists' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
</ins><span class="cx">
</span><span class="cx"> // Form has been submitted and nonce checks out, lets do it.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-core/bp-core-signup.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx"> /* Check the nonce */
</span><span class="cx"> check_admin_referer( 'bp_new_signup' );
</span><span class="cx">
</span><del>- bp_core_maybe_include_user_registration_file();
-
</del><span class="cx"> /* Check the base account details for problems */
</span><span class="cx"> $account_details = bp_core_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
</span><span class="cx">
</span><span class="lines">@@ -217,8 +215,6 @@
</span><span class="cx"> /* Check if an activation key has been passed */
</span><span class="cx"> if ( isset( $_GET['key'] ) ) {
</span><span class="cx">
</span><del>- bp_core_maybe_include_user_registration_file();
-
</del><span class="cx"> /* Activate the signup */
</span><span class="cx"> $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
</span><span class="cx">
</span><span class="lines">@@ -352,6 +348,9 @@
</span><span class="cx"> function bp_core_validate_user_signup( $user_name, $user_email ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ if ( ! function_exists( 'validate_username' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
+
</ins><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">@@ -430,6 +429,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx">
</span><ins>+ if ( ! function_exists( 'wp_insert_user' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
+
</ins><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">@@ -536,7 +538,11 @@
</span><span class="cx"> delete_user_meta( $user_id, 'activation_key' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* Update the user_url and display_name */
</del><ins>+ // Update the user_url and display_name
+ // Support for WP < 3.1
+ if ( ! function_exists( 'wp_update_user' ) )
+ require_once( ABSPATH . WPINC . '/registration.php' );
+
</ins><span class="cx"> wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
</span><span class="cx">
</span><span class="cx"> /* Add a last active entry */
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-core/bp-core-templatetags.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -1278,7 +1278,11 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
</del><ins>+ if ( !empty( $_POST['signup_avatar_dir'] ) ) {
+ $signup_avatar_dir = $_POST['signup_avatar_dir'];
+ } else if ( !empty( $bp->signup->avatar_dir ) ) {
+ $signup_avatar_dir = $bp->signup->avatar_dir;
+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty( $signup_avatar_dir ) ) {
</span><span class="cx"> if ( empty( $bp->grav_default->user ) ) {
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3665 => 3666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2011-01-06 14:57:57 UTC (rev 3665)
+++ trunk/bp-core.php 2011-01-06 15:17:09 UTC (rev 3666)
</span><span class="lines">@@ -285,21 +285,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * If we're not on WordPress 3.1+, then include the file containing the user registration methods.
- *
- * @global float $wp_version WordPress version number
- * @since 1.3
- */
-function bp_core_maybe_include_user_registration_file() {
- global $wp_version;
-
- if ( $wp_version >= 3.1 )
- return;
-
- require_once( ABSPATH . WPINC . '/registration.php' );
-}
-
-/**
</del><span class="cx"> * bp_core_admin_menu_init()
</span><span class="cx"> *
</span><span class="cx"> * Initializes the wp-admin area "BuddyPress" menus and sub menus.
</span></span></pre>
</div>
</div>
</body>
</html>