<!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][7122] trunk: Introduces bp_get_the_profile_field_errors_action()</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://buddypress.trac.wordpress.org/changeset/7122">7122</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-28 03:48:47 +0000 (Tue, 28 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduces bp_get_the_profile_field_errors_action()
This convenience function concatenates an action name for use in rendering the
errors associated with a given xprofile field during registration.
Previously, the action name was concatenated inline, using the _field_name_
value. This caused problems in the case of multiselect fields, which have a
field name appended with '[]' for other reasons. See <a href="http://buddypress.trac.wordpress.org/ticket/2173">#2173</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4978">#4978</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressmembersregisterphp">trunk/bp-templates/bp-legacy/buddypress/members/register.php</a></li>
<li><a href="#trunkbpthemesbpdefaultregistrationregisterphp">trunk/bp-themes/bp-default/registration/register.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatephp">trunk/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressmembersregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/register.php (7121 => 7122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/register.php 2013-05-28 03:35:16 UTC (rev 7121)
+++ trunk/bp-templates/bp-legacy/buddypress/members/register.php 2013-05-28 03:48:47 UTC (rev 7122)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <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(); ?>" />
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <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>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>">
</span><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" multiple="multiple">
</span><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> <div class="radio">
</span><span class="cx"> <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>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> <div class="checkbox">
</span><span class="cx"> <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>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="datebox">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx">
</span><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day">
</span><span class="cx"> <?php bp_the_profile_field_options( 'type=day' ); ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/registration/register.php (7121 => 7122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/registration/register.php 2013-05-28 03:35:16 UTC (rev 7121)
+++ trunk/bp-themes/bp-default/registration/register.php 2013-05-28 03:48:47 UTC (rev 7122)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <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(); ?>" />
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <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>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>">
</span><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
</span><span class="cx">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" multiple="multiple">
</span><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> <div class="radio">
</span><span class="cx"> <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>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> <div class="checkbox">
</span><span class="cx"> <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>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx"> <?php bp_the_profile_field_options(); ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="datebox">
</span><span class="cx"> <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>
</span><del>- <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?>
</del><ins>+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
</ins><span class="cx">
</span><span class="cx"> <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day">
</span><span class="cx"> <?php bp_the_profile_field_options( 'type=day' ); ?>
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (7121 => 7122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2013-05-28 03:35:16 UTC (rev 7121)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2013-05-28 03:48:47 UTC (rev 7122)
</span><span class="lines">@@ -388,6 +388,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Returns the action name for any signup errors related to this profile field
+ *
+ * In the registration templates, signup errors are pulled from the global
+ * object and rendered at actions that look like 'bp_field_12_errors'. This
+ * function allows the action name to be easily concatenated and called in the
+ * following fashion:
+ * do_action( bp_get_the_profile_field_errors_action() );
+ *
+ * @since BuddyPress (1.8)
+ * @return string The _errors action name corresponding to this profile field
+ */
+function bp_get_the_profile_field_errors_action() {
+ global $field;
+ return 'bp_field_' . $field->id . '_errors';
+}
+
+/**
</ins><span class="cx"> * bp_the_profile_field_options()
</span><span class="cx"> *
</span><span class="cx"> * Displays field options HTML for field types of 'selectbox', 'multiselectbox',
</span></span></pre>
</div>
</div>
</body>
</html>