<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2583] trunk: Fixes #1802</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2583</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 12:10:32 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1802</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoresignupphp">trunk/bp-core/bp-core-signup.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersindexphp">trunk/bp-themes/bp-default/members/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultregistrationregisterphp">trunk/bp-themes/bp-default/registration/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (2582 => 2583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2010-02-04 11:51:04 UTC (rev 2582)
+++ trunk/bp-core/bp-core-signup.php 2010-02-04 12:10:32 UTC (rev 2583)
</span><span class="lines">@@ -52,18 +52,20 @@
</span><span class="cx"> $bp->signup->username = $_POST['signup_username'];
</span><span class="cx"> $bp->signup->email = $_POST['signup_email'];
</span><span class="cx">
</span><del>- /* Now we've checked account details, we can check profile information */
- $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
</del><ins>+ if ( !empty( $_POST['signup_profile_field_ids'] ) && function_exists( 'xprofile_check_is_required_field' ) ) {
+ /* Now we've checked account details, we can check profile information */
+ $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
</ins><span class="cx">
</span><del>- /* Loop through the posted fields formatting any datebox values then validate the field */
- foreach ( (array) $profile_field_ids as $field_id ) {
- if ( !isset( $_POST['field_' . $field_id] ) ) {
- if ( isset( $_POST['field_' . $field_id . '_day'] ) )
- $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
</del><ins>+ /* Loop through the posted fields formatting any datebox values then validate the field */
+ foreach ( (array) $profile_field_ids as $field_id ) {
+ if ( !isset( $_POST['field_' . $field_id] ) ) {
+ if ( isset( $_POST['field_' . $field_id . '_day'] ) )
+ $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+ }
+
+ if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
+ $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
</ins><span class="cx"> }
</span><del>-
- if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
- $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Finally, let's check the blog details, if the user wants a blog and blog creation is enabled */
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/index.php (2582 => 2583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2010-02-04 11:51:04 UTC (rev 2582)
+++ trunk/bp-themes/bp-default/members/index.php 2010-02-04 12:10:32 UTC (rev 2583)
</span><span class="lines">@@ -29,8 +29,11 @@
</span><span class="cx"> <select>
</span><span class="cx"> <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
</span><del>- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
</del><span class="cx">
</span><ins>+ <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+ <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
+ <?php endif; ?>
+
</ins><span class="cx"> <?php do_action( 'bp_members_directory_order_options' ) ?>
</span><span class="cx"> </select>
</span><span class="cx"> </li>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/registration/register.php (2582 => 2583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/registration/register.php 2010-02-04 11:51:04 UTC (rev 2582)
+++ trunk/bp-themes/bp-default/registration/register.php 2010-02-04 12:10:32 UTC (rev 2583)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> <?php do_action( 'bp_signup_password_confirm_errors' ) ?>
</span><span class="cx"> <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" />
</span><span class="cx">
</span><del>- </div>
</del><ins>+ </div><!-- #basic-details-section -->
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_account_details_fields' ) ?>
</span><span class="cx">
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">
</span><span class="cx"> <?php /***** Extra Profile Details ******/ ?>
</span><span class="cx">
</span><ins>+ <?php if ( bp_is_active( 'xprofile' ) ) : ?>
</ins><span class="cx"> <div class="register-section" id="profile-details-section">
</span><span class="cx">
</span><span class="cx"> <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
</span><span class="lines">@@ -154,9 +155,10 @@
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
</span><span class="cx">
</span><del>- </div>
</del><ins>+ <?php endwhile; endif; endif; ?>
</ins><span class="cx">
</span><del>- <?php endwhile; endif; endif; ?>
</del><ins>+ </div><!-- #profile-details-section -->
+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_signup_profile_fields' ) ?>
</span><span class="cx">
</span><span class="lines">@@ -195,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- </div>
</del><ins>+ </div><!-- #blog-details-section -->
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_blog_details_fields' ) ?>
</span><span class="cx">
</span><span class="lines">@@ -204,7 +206,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_registration_submit_buttons' ) ?>
</span><span class="cx">
</span><span class="cx"> <div class="submit">
</span><del>- <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
</del><ins>+ <input type="submit"name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_registration_submit_buttons' ) ?>
</span><span class="lines">@@ -225,7 +227,7 @@
</span><span class="cx"> <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ) ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
</del><ins>+ <?php if ( bp_is_active( 'xprofile' ) && !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>