<!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][10305] trunk/src/bp-xprofile/classes: xProfile: adjust wp-admin field labels</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10305">10305</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10305","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-22 09:04:44 +0000 (Thu, 22 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>xProfile: adjust wp-admin field labels
The `admin_field_html` method is only used inside wp-admin, so there's
no need to wrap these template bits inside `is_admin` checks.
Partially reverts the changes in <a href="http://buddypress.trac.wordpress.org/changeset/10298">r10298</a>:10302. See <a href="http://buddypress.trac.wordpress.org/ticket/6655">#6655</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypemultiselectboxphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-multiselectbox.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypenumberphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-number.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypeselectboxphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-selectbox.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypetextboxphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-textbox.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypeurlphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-url.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypephp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypemultiselectboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-multiselectbox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-multiselectbox.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-multiselectbox.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,23 +180,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_field_html( array $raw_properties = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bp_parse_args( $raw_properties, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'multiple' => 'multiple'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Select', 'buddypress' ); ?></label>
+ <select <?php echo $this->get_edit_field_html_elements( $r ); ?>>
+ <?php bp_the_profile_field_options(); ?>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Select', 'buddypress' ); ?></label>
- <select <?php echo $this->get_edit_field_html_elements( $r ); ?>>
- <?php bp_the_profile_field_options(); ?>
- </select>
-
- <?php else : ?>
-
- <select <?php echo $this->get_edit_field_html_elements( $r ); ?>>
- <?php bp_the_profile_field_options(); ?>
- </select>
-
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypenumberphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-number.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-number.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-number.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,19 +91,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_field_html( array $raw_properties = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bp_parse_args( $raw_properties, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'number'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() ) : ?>
-
- <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Number field', 'buddypress' ); ?></label>
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php else : ?>
-
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php endif; ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Number field', 'buddypress' ); ?></label>
+ <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypeselectboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-selectbox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-selectbox.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-selectbox.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,22 +161,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $raw_properties Optional key/value array of permitted attributes that you want to add.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_field_html( array $raw_properties = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Select', 'buddypress' ); ?></label>
+ <select <?php echo $this->get_edit_field_html_elements( $raw_properties ); ?>>
+ <?php bp_the_profile_field_options(); ?>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Select', 'buddypress' ); ?></label>
- <select <?php echo $this->get_edit_field_html_elements( $raw_properties ); ?>>
- <?php bp_the_profile_field_options(); ?>
- </select>
-
- <?php else : ?>
-
- <select <?php echo $this->get_edit_field_html_elements( $raw_properties ); ?>>
- <?php bp_the_profile_field_options(); ?>
- </select>
-
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypetextboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-textbox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-textbox.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-textbox.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,19 +91,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bp_parse_args( $raw_properties, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'text'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Textbox', 'buddypress' ); ?></label>
+ <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'Textbox', 'buddypress' ); ?></label>
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php else : ?>
-
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypeurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-url.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-url.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-url.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,19 +93,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bp_parse_args( $raw_properties, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'url'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'URL', 'buddypress' ); ?></label>
+ <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="<?php bp_the_profile_field_input_name(); ?>" class="screen-reader-text"><?php esc_html_e( 'URL', 'buddypress' ); ?></label>
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php else : ?>
-
- <input <?php echo $this->get_edit_field_html_elements( $r ); ?>>
-
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php 2015-10-22 06:12:16 UTC (rev 10304)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php 2015-10-22 09:04:44 UTC (rev 10305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validation regex rules for field type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array Field type validation regexes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>