<!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] [2963] branches/1.2/bp-themes/bp-default/registration/register
.php: Fixes #2314 props jeffsayre</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2963</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-28 20:29:24 +0000 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2314 props jeffsayre</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefaultregistrationregisterphp">branches/1.2/bp-themes/bp-default/registration/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/registration/register.php (2962 => 2963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/registration/register.php 2010-04-28 13:13:17 UTC (rev 2962)
+++ branches/1.2/bp-themes/bp-default/registration/register.php 2010-04-28 20:29:24 UTC (rev 2963)
</span><span class="lines">@@ -45,123 +45,124 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_account_details_fields' ) ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_blog_details_fields' ) ?>
-
-
</del><span class="cx"> <?php /***** Extra Profile Details ******/ ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'xprofile' ) ) : ?>
</span><del>- <div class="register-section" id="profile-details-section">
</del><span class="cx">
</span><del>- <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
</del><ins>+ <?php do_action( 'bp_before_signup_profile_fields' ) ?>
</ins><span class="cx">
</span><del>- <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
- <?php if ( function_exists( 'bp_has_profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
</del><ins>+ <div class="register-section" id="profile-details-section">
</ins><span class="cx">
</span><del>- <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
</del><ins>+ <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
</ins><span class="cx">
</span><del>- <div class="editfield">
</del><ins>+ <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
+ <?php if ( function_exists( 'bp_has_profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
</ins><span class="cx">
</span><del>- <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
</ins><span class="cx">
</span><del>- <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
</del><ins>+ <div class="editfield">
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
</ins><span class="cx">
</span><del>- <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
</ins><span class="cx">
</span><del>- <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
- <?php bp_the_profile_field_options() ?>
- </select>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
+ <?php bp_the_profile_field_options() ?>
+ </select>
</ins><span class="cx">
</span><del>- <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
- <?php bp_the_profile_field_options() ?>
- </select>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
+ <?php bp_the_profile_field_options() ?>
+ </select>
</ins><span class="cx">
</span><del>- <div class="radio">
- <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <?php bp_the_profile_field_options() ?>
</del><ins>+ <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
- <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
- <?php endif; ?>
- </div>
</del><ins>+ <div class="radio">
+ <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <?php bp_the_profile_field_options() ?>
</ins><span class="cx">
</span><del>- <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+ <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+ <?php endif; ?>
+ </div>
</ins><span class="cx">
</span><del>- <div class="checkbox">
- <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
- <?php bp_the_profile_field_options() ?>
- </div>
</del><ins>+ <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <div class="checkbox">
+ <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
</ins><span class="cx">
</span><del>- <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
</del><ins>+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+ <?php bp_the_profile_field_options() ?>
+ </div>
</ins><span class="cx">
</span><del>- <div class="datebox">
- <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
- <?php bp_the_profile_field_options( 'type=day' ) ?>
- </select>
</del><ins>+ <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
</ins><span class="cx">
</span><del>- <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
- <?php bp_the_profile_field_options( 'type=month' ) ?>
- </select>
</del><ins>+ <div class="datebox">
+ <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+ <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
</ins><span class="cx">
</span><del>- <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
- <?php bp_the_profile_field_options( 'type=year' ) ?>
- </select>
- </div>
</del><ins>+ <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
+ <?php bp_the_profile_field_options( 'type=day' ) ?>
+ </select>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
+ <?php bp_the_profile_field_options( 'type=month' ) ?>
+ </select>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
</del><ins>+ <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
+ <?php bp_the_profile_field_options( 'type=year' ) ?>
+ </select>
+ </div>
</ins><span class="cx">
</span><del>- <p class="description"><?php bp_the_profile_field_description() ?></p>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- </div>
</del><ins>+ <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
</del><ins>+ <p class="description"><?php bp_the_profile_field_description() ?></p>
</ins><span class="cx">
</span><del>- <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
</del><ins>+ </div>
</ins><span class="cx">
</span><del>- <?php endwhile; endif; endif; ?>
</del><ins>+ <?php endwhile; ?>
</ins><span class="cx">
</span><del>- </div><!-- #profile-details-section -->
- <?php endif; ?>
</del><ins>+ <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_signup_profile_fields' ) ?>
</del><ins>+ <?php endwhile; endif; endif; ?>
</ins><span class="cx">
</span><ins>+ </div><!-- #profile-details-section -->
+
+ <?php do_action( 'bp_after_signup_profile_fields' ) ?>
+
+ <?php endif; ?>
+
</ins><span class="cx"> <?php if ( bp_get_blog_signup_allowed() ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_blog_details_fields' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>