Changeset 13494

Timestamp:

06/01/2023 01:12:15 AM (2 years ago)

Author:

imath

Message:

Make new profile field/group description default to an empty string

Doing so prevents a PHP8.1 deprecation notice

Fixes #8862
Closes ​https://github.com/buddypress/buddypress/pull/111

Location:

trunk/src/bp-xprofile/classes

Files:

• class-bp-xprofile-field.php (modified) (3 diffs)
• class-bp-xprofile-group.php (modified) (6 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -1514 +1514 @@
      */
     private function name_and_description() {
+        // Set default values.
+        $description = '';
+        $name        = '';
+
+        if ( $this->description ) {
+            $description = $this->description;
+        }
+
+        if ( $this->name ) {
+            $name = $this->name;
+        }
     ?>
 
@@ -1519 +1530 @@
             <div class="titlewrap">
                 <label id="title-prompt-text" for="title"><?php echo esc_html_x( 'Name (required)', 'XProfile admin edit field', 'buddypress' ); ?></label>
-                <input type="text" name="title" id="title" value="<?php echo esc_attr( $this->name ); ?>" autocomplete="off" />
+                <input type="text" name="title" id="title" value="<?php echo esc_attr( $name ); ?>" autocomplete="off" />
             </div>
         </div>
@@ -1526 +1537 @@
             <h2><?php echo esc_html_x( 'Description', 'XProfile admin edit field', 'buddypress' ); ?></h2>
             <div class="inside">
-                <label for="description" class="screen-reader-text"><?php
+                <label for="description" class="screen-reader-text">
+                    <?php
                     /* translators: accessibility text */
                     esc_html_e( 'Add description', 'buddypress' );
-                ?></label>
-                <textarea name="description" id="description" rows="8" cols="60"><?php echo esc_textarea( $this->description ); ?></textarea>
+                    ?>
+                </label>
+                <textarea name="description" id="description" rows="8" cols="60"><?php echo esc_textarea( $description ); ?></textarea>
             </div>
         </div>

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -466 +466 @@
      * @since 5.0.0
      * @since 11.0.0 `$profile_group_id` accepts an array of profile group ids.
-     * 
+     *
      * @global wpdb $wpdb WordPress database object.
      *
@@ -525 +525 @@
      *
      * @since 5.0.0
-     * 
+     *
      * @global wpdb $wpdb WordPress database object.
      *
@@ -619 +619 @@
      *
      * @since 2.0.0
-     * 
+     *
      * @global wpdb $wpdb WordPress database object.
      *
@@ -791 +791 @@
      *
      * @since 1.6.0
-     * 
+     *
      * @global wpdb $wpdb WordPress database object.
      *
@@ -850 +850 @@
         // New field group.
         if ( empty( $this->id ) ) {
-            $title  = __( 'Add New Field Group', 'buddypress' );
-            $button = __( 'Save',                'buddypress' );
-            $action = add_query_arg( array(
-                'page' => 'bp-profile-setup',
-                'mode' => 'add_group',
-            ), $users_url );
+            $title       = __( 'Add New Field Group', 'buddypress' );
+            $button      = __( 'Save',                'buddypress' );
+            $action      = add_query_arg(
+                array(
+                    'page' => 'bp-profile-setup',
+                    'mode' => 'add_group',
+                ),
+                $users_url
+            );
+            $description = '';
 
         // Existing field group.
         } else {
-            $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 );
+            $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;
 
             if ( $this->can_delete ) {
@@ -903 +911 @@
                                 <h2><?php esc_html_e( 'Field Group Description', 'buddypress' ); ?></h2>
                                 <div class="inside">
-                                    <label for="group_description" class="screen-reader-text"><?php
+                                    <label for="group_description" class="screen-reader-text">
+                                        <?php
                                         /* translators: accessibility text */
                                         esc_html_e( 'Add description', 'buddypress' );
-                                    ?></label>
-                                    <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo esc_textarea( $this->description ); ?></textarea>
+                                        ?>
+                                    </label>
+                                    <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo esc_textarea( $description ); ?></textarea>
                                 </div>
                             </div>