Changeset 13327 for trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/data.php

Timestamp:

09/20/2022 08:10:19 AM (3 years ago)

Author:

imath

Message:

Settings: put the Legacy template pack’s in line with Nouveau’s one

Makes sure, just like the BP Nouveau template pack, the BP Legacy’s members/single/settings/data.php template contains a section to inform how the user can completely remove their data. This commit also brings some complementary improvements:

• Avoid is_super_admin( $user_id ) usage in favor of a capability check.
• Remove some commented code which was duplicated from a previous section into the legacy settings/data template.
• Escape URLs and translated strings.
• Improve `/* Translators: */ inline comment.
• Do not show the link to delete an account to an administrator viewing their account as they are redirected to the member's home page when trying to reach the delete-account screen (Admins cannot delete their account form front end).

Props Venutius, tahmidulkarim

Closes ​https://github.com/buddypress/buddypress/pull/23
Fixes #8021

File:

• trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/data.php (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/data.php

@@ -4 +4 @@
  *
  * @since 3.1.0
- * @version 8.0.0
+ * @version 11.0.0
  */
 
@@ -59 +59 @@
 <?php endif; ?>
 
-<h2 class="screen-heading data-settings-screen">
-    <?php esc_html_e( 'Data Erase', 'buddypress' ); ?>
-</h2>
+<?php if ( ! user_can( bp_displayed_user_id(), 'delete_users' ) ) : ?>
+    <h2 class="screen-heading data-settings-screen">
+        <?php esc_html_e( 'Data Erase', 'buddypress' ); ?>
+    </h2>
 
-<?php /* translators: Link to Delete Account Settings page */ ?>
-<p><?php esc_html_e( 'To erase all data associated with your account, your user account must be completely deleted.', 'buddypress' ); ?> <?php if ( bp_disable_account_deletion() ) : ?><?php esc_html_e( 'Please contact the site administrator to request account deletion.', 'buddypress' ); ?><?php else : ?><?php printf( esc_html__( 'You may delete your account by visiting the %s page.', 'buddypress' ), sprintf( '<a href="%s">%s</a>', bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/delete-account/', esc_html__( 'Delete Account', 'buddypress' ) ) ); ?><?php endif; ?></p>
+    <p>
+        <?php
+        esc_html_e( 'To erase all data associated with your account, your user account must be completely deleted.', 'buddypress' );
 
+        if ( bp_disable_account_deletion() ) {
+            esc_html_e( 'Please contact the site administrator to request account deletion.', 'buddypress' );
+        } else {
+            echo '&nbsp;';
+
+            printf(
+                /* translators: %s the link to Delete Account Settings page */
+                esc_html__( 'You may delete your account by visiting the %s page.', 'buddypress' ),
+                sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/delete-account/' ),
+                    esc_html__( 'Delete Account', 'buddypress' )
+                )
+            );
+        }
+        ?>
+    </p>
 <?php
+endif;
+
 bp_nouveau_member_hook( 'after', 'settings_template' );