<!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][13494] trunk/src/bp-xprofile/classes: Make new profile field/group description default to an empty string</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 { white-space: pre-line; 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/13494">13494</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/13494","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-01 01:12:15 +0000 (Thu, 01 Jun 2023)</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'>Make new profile field/group description default to an empty string
Doing so prevents a PHP8.1 deprecation notice
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8862">#8862</a>
Closes https://github.com/buddypress/buddypress/pull/111</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilegroupphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldphp"></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.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.php 2023-05-30 05:56:44 UTC (rev 13493)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php 2023-06-01 01:12:15 UTC (rev 13494)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,12 +1513,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function name_and_description() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set default values.
+ $description = '';
+ $name = '';
+
+ if ( $this->description ) {
+ $description = $this->description;
+ }
+
+ if ( $this->name ) {
+ $name = $this->name;
+ }
</ins><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"> <div id="titlediv">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="titlewrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <label id="title-prompt-text" for="title"><?php echo esc_html_x( 'Name (required)', 'XProfile admin edit field', 'buddypress' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" name="title" id="title" value="<?php echo esc_attr( $this->name ); ?>" autocomplete="off" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" name="title" id="title" value="<?php echo esc_attr( $name ); ?>" autocomplete="off" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1525,11 +1536,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="postbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php echo esc_html_x( 'Description', 'XProfile admin edit field', 'buddypress' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="description" class="screen-reader-text"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="description" class="screen-reader-text">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: accessibility text */
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html_e( 'Add description', 'buddypress' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></label>
- <textarea name="description" id="description" rows="8" cols="60"><?php echo esc_textarea( $this->description ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </label>
+ <textarea name="description" id="description" rows="8" cols="60"><?php echo esc_textarea( $description ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilegroupphp"></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-group.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-group.php 2023-05-30 05:56:44 UTC (rev 13493)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php 2023-06-01 01:12:15 UTC (rev 13494)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 11.0.0 `$profile_group_id` accepts an array of profile group ids.
</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"> * @global wpdb $wpdb WordPress database object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets group field IDs, based on passed parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</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"> * @global wpdb $wpdb WordPress database object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $group_ids Array of group IDs.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +618,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get data about a set of groups, based on IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</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"> * @global wpdb $wpdb WordPress database object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $group_ids Array of IDs.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,7 +790,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fetch the admin-set preferences for all fields.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</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"> * @global wpdb $wpdb WordPress database object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $default_visibility_levels An array, keyed by field_id, of default
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,22 +849,30 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New field group.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = __( 'Add New Field Group', 'buddypress' );
- $button = __( 'Save', 'buddypress' );
- $action = add_query_arg( array(
- 'page' => 'bp-profile-setup',
- 'mode' => 'add_group',
- ), $users_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = __( 'Add New Field Group', 'buddypress' );
+ $button = __( 'Save', 'buddypress' );
+ $action = add_query_arg(
+ array(
+ 'page' => 'bp-profile-setup',
+ 'mode' => 'add_group',
+ ),
+ $users_url
+ );
+ $description = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Existing field group.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = __( 'Edit Field Group', 'buddypress' );
- $button = __( 'Update', 'buddypress' );
- $action = add_query_arg( array(
- 'page' => 'bp-profile-setup',
- 'mode' => 'edit_group',
- 'group_id' => (int) $this->id,
- ), $users_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = __( 'Edit Field Group', 'buddypress' );
+ $button = __( 'Update', 'buddypress' );
+ $action = add_query_arg(
+ array(
+ 'page' => 'bp-profile-setup',
+ 'mode' => 'edit_group',
+ 'group_id' => (int) $this->id,
+ ),
+ $users_url
+ );
+ $description = $this->description;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->can_delete ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete Group URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -902,11 +910,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="postbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php esc_html_e( 'Field Group Description', 'buddypress' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="group_description" class="screen-reader-text"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="group_description" class="screen-reader-text">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: accessibility text */
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html_e( 'Add description', 'buddypress' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></label>
- <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo esc_textarea( $this->description ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </label>
+ <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo esc_textarea( $description ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>