Changeset 11839

Timestamp:

02/01/2018 10:26:00 PM (7 years ago)

Author:

djpaul

Message:

Templates: swap shared _attachments/avatars/index.php with Legacy version; fix path in wp-admin.

The Nouveau template was previously used, and included a call to a Nouveau-only function, which I missed in r11835.
The Nouveau pack now has a copy of its Nouveau template again.

Also changes a patch in bp_attachments_get_template_part() to support the changed location for this template asset.
This is used for the "Upload Avatar" screens in wp-admin Users > Edit.

Props boonebgorges, hnla.

Fixes #7679 and #7675

Location:

trunk/src

Files:

• bp-core/bp-core-attachments.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php (deleted)
• bp-templates/bp-nouveau/buddypress/assets (added)
• bp-templates/bp-nouveau/buddypress/assets/_attachments (added)
• bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars (added)
• bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php (copied) (copied from trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php)
• bp-templates/shared/buddypress/assets/_attachments/avatars/index.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-attachments.php

@@ -926 +926 @@
     // Load the attachment template in WP Administration screens.
     if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
-        $attachment_admin_template_part = buddypress()->themes_dir . '/bp-legacy/buddypress/' . $attachment_template_part . '.php';
+        $attachment_admin_template_part = buddypress()->themes_dir . '/shared/buddypress/' . $attachment_template_part . '.php';
 
         // Check whether the template part exists.

trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php

@@ -9 +9 @@
  *
  * @since 2.3.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-attachments
  */
 
@@ -32 +35 @@
 <script id="tmpl-bp-avatar-delete" type="text/html">
     <# if ( 'user' === data.object ) { #>
-        <p><?php esc_html_e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
-        <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
+        <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
+        <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
     <# } else if ( 'group' === data.object ) { #>
-        <?php bp_nouveau_user_feedback( 'group-avatar-delete-info' ); ?>
-        <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></button>
+        <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
+        <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></a></p>
     <# } else { #>
         <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
@@ -42 +45 @@
 </script>
 
-<?php do_action( 'bp_attachments_avatar_main_template' ); ?>
+<?php do_action( 'bp_attachments_avatar_main_template' );