Skip to:
Content

BuddyPress.org

Ticket #7672: 7672.1.patch

File 7672.1.patch, 25.5 KB (added by DJPaul, 7 years ago)
  • src/bp-core/bp-core-theme-compatibility.php

    diff --git a/src/bp-core/bp-core-theme-compatibility.php b/src/bp-core/bp-core-theme-compatibility.php
    index 74505bf8d..a4b6423c0 100644
    a b function bp_theme_compat_loop_end( $query ) { 
    987987        unset( $bp->theme_compat->is_page_toggled );
    988988}
    989989add_action( 'loop_end', 'bp_theme_compat_loop_end' );
     990
     991/**
     992 * Get the absolute path to the shared theme assets folder.
     993 *
     994 * @since 3.0.0
     995 *
     996 * @return string The absolute path to the shared theme assets folder.
     997 */
     998function bp_get_shared_theme_assets_dir() {
     999
     1000        /**
     1001         * Filters the absolute path to the shared theme assets folder.
     1002         *
     1003         * @since 3.0.0
     1004         *
     1005         * @param string $dir The absolute path to the shared theme assets folder.
     1006         */
     1007        return apply_filters( 'bp_get_theme_compat_dir', buddypress()->themes_dir . '/shared' );
     1008}
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php
    deleted file mode 100644
    index 9b1119896..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress Avatars camera template.
    4  *
    5  * This template is used to create the camera Backbone views.
    6  *
    7  * @since 2.3.0
    8  */
    9 
    10 ?>
    11 <script id="tmpl-bp-avatar-webcam" type="text/html">
    12         <# if ( ! data.user_media ) { #>
    13                 <div id="bp-webcam-message">
    14                         <p class="warning"><?php esc_html_e( 'Your browser does not support this feature.', 'buddypress' );?></p>
    15                 </div>
    16         <# } else { #>
    17                 <div id="avatar-to-crop"></div>
    18                 <div class="avatar-crop-management">
    19                         <div id="avatar-crop-pane" class="avatar" style="width:{{data.w}}px; height:{{data.h}}px"></div>
    20                         <div id="avatar-crop-actions">
    21                                 <button type="button" class="button avatar-webcam-capture"><?php esc_html_e( 'Capture', 'buddypress' );?></button>
    22                                 <button type="button" class="button avatar-webcam-save"><?php esc_html_e( 'Save', 'buddypress' );?></button>
    23                         </div>
    24                 </div>
    25         <# } #>
    26 </script>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php
    deleted file mode 100644
    index e392166c9..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress Avatars crop template.
    4  *
    5  * This template is used to create the crop Backbone views.
    6  *
    7  * @since 2.3.0
    8  */
    9 
    10 ?>
    11 <script id="tmpl-bp-avatar-item" type="text/html">
    12         <div id="avatar-to-crop">
    13                 <img src="{{data.url}}"/>
    14         </div>
    15         <div class="avatar-crop-management">
    16                 <div id="avatar-crop-pane" class="avatar" style="width:{{data.full_w}}px; height:{{data.full_h}}px">
    17                         <img src="{{data.url}}" id="avatar-crop-preview"/>
    18                 </div>
    19                 <div id="avatar-crop-actions">
    20                         <button type="button" class="button avatar-crop-submit"><?php esc_html_e( 'Crop Image', 'buddypress' ); ?></button>
    21                 </div>
    22         </div>
    23 </script>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php
    deleted file mode 100644
    index c46ebca45..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress Avatars main template.
    4  *
    5  * This template is used to inject the BuddyPress Backbone views
    6  * dealing with avatars.
    7  *
    8  * It's also used to create the common Backbone views.
    9  *
    10  * @since 2.3.0
    11  */
    12 
    13 /**
    14  * This action is for internal use, please do not use it
    15  */
    16 do_action( 'bp_attachments_avatar_check_template' );
    17 ?>
    18 <div class="bp-avatar-nav"></div>
    19 <div class="bp-avatar"></div>
    20 <div class="bp-avatar-status"></div>
    21 
    22 <script type="text/html" id="tmpl-bp-avatar-nav">
    23         <a href="{{data.href}}" class="bp-avatar-nav-item" data-nav="{{data.id}}">{{data.name}}</a>
    24 </script>
    25 
    26 <?php bp_attachments_get_template_part( 'uploader' ); ?>
    27 
    28 <?php bp_attachments_get_template_part( 'avatars/crop' ); ?>
    29 
    30 <?php bp_attachments_get_template_part( 'avatars/camera' ); ?>
    31 
    32 <script id="tmpl-bp-avatar-delete" type="text/html">
    33         <# if ( 'user' === data.object ) { #>
    34                 <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>
    35                 <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
    36         <# } else if ( 'group' === data.object ) { #>
    37                 <?php bp_nouveau_user_feedback( 'group-avatar-delete-info' ); ?>
    38                 <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></button>
    39         <# } else { #>
    40                 <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
    41         <# } #>
    42 </script>
    43 
    44 <?php do_action( 'bp_attachments_avatar_main_template' ); ?>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php
    deleted file mode 100644
    index 64e924875..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress Cover Images main template.
    4  *
    5  * This template is used to inject the BuddyPress Backbone views
    6  * dealing with cover images.
    7  *
    8  * It's also used to create the common Backbone views.
    9  *
    10  * @since 2.4.0
    11  */
    12 
    13 ?>
    14 
    15 <div class="bp-cover-image"></div>
    16 <div class="bp-cover-image-status"></div>
    17 <div class="bp-cover-image-manage"></div>
    18 
    19 <?php bp_attachments_get_template_part( 'uploader' ); ?>
    20 
    21 <script id="tmpl-bp-cover-image-delete" type="text/html">
    22         <# if ( 'user' === data.object ) { #>
    23                 <p><?php _e( "If you'd like to delete your current cover image but not upload a new one, please use the delete Cover Image button.", 'buddypress' ); ?></p>
    24                 <button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete My Cover Image', 'buddypress' ); ?></button>
    25         <# } else if ( 'group' === data.object ) { #>
    26                 <p><?php _e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
    27                 <button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete Group Cover Image', 'buddypress' ); ?></button>
    28         <# } else { #>
    29                 <?php do_action( 'bp_attachments_cover_image_delete_template' ); ?>
    30         <# } #>
    31 </script>
    32 
    33 <?php do_action( 'bp_attachments_cover_image_main_template' ); ?>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php
    deleted file mode 100644
    index 67b2322b9..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress Uploader templates.
    4  *
    5  * This template is used to create the BuddyPress Uploader Backbone views.
    6  *
    7  * @since 2.3.0
    8  */
    9 
    10 ?>
    11 <script type="text/html" id="tmpl-upload-window">
    12         <?php if ( ! _device_can_upload() ) : ?>
    13                 <h3 class="upload-instructions"><?php esc_html_e( 'The web browser on your device cannot be used to upload files.', 'buddypress' ); ?></h3>
    14         <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
    15                 <h3 class="upload-instructions"><?php esc_html_e( 'Upload Limit Exceeded', 'buddypress' ); ?></h3>
    16         <?php else : ?>
    17                 <div id="{{data.container}}">
    18                         <div id="{{data.drop_element}}">
    19                                 <div class="drag-drop-inside">
    20                                         <p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
    21                                         <p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
    22                                         <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php esc_html_e( 'Select your File', 'buddypress' ); ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
    23                                 </div>
    24                         </div>
    25                 </div>
    26         <?php endif; ?>
    27 </script>
    28 
    29 <script type="text/html" id="tmpl-progress-window">
    30         <div id="{{data.id}}">
    31                 <div class="bp-progress">
    32                         <div class="bp-bar"></div>
    33                 </div>
    34                 <div class="filename">{{data.filename}}</div>
    35         </div>
    36 </script>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php b/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php
    deleted file mode 100644
    index 633cafa27..000000000
    + -  
    1 <?php
    2 /**
    3  * BuddyPress email template.
    4  *
    5  * Magic numbers:
    6  *  1.618 = golden mean.
    7  *  1.35  = default body_text_size multipler. Gives default heading of 20px.
    8  *
    9  * @since 2.5.0
    10  *
    11  * @package BuddyPress
    12  * @subpackage Core
    13  */
    14 
    15 /*
    16 Based on the Cerberus "Fluid" template by Ted Goas (http://tedgoas.github.io/Cerberus/).
    17 License for the original template:
    18 
    19 
    20 The MIT License (MIT)
    21 
    22 Copyright (c) 2017 Ted Goas
    23 
    24 Permission is hereby granted, free of charge, to any person obtaining a copy of
    25 this software and associated documentation files (the "Software"), to deal in
    26 the Software without restriction, including without limitation the rights to
    27 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
    28 the Software, and to permit persons to whom the Software is furnished to do so,
    29 subject to the following conditions:
    30 
    31 The above copyright notice and this permission notice shall be included in all
    32 copies or substantial portions of the Software.
    33 
    34 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    35 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
    36 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
    37 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
    38 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    39 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    40 */
    41 
    42 // Exit if accessed directly.
    43 defined( 'ABSPATH' ) || exit;
    44 
    45 $settings = bp_email_get_appearance_settings();
    46 
    47 ?><!DOCTYPE html>
    48 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
    49 <head>
    50         <meta charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
    51         <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
    52         <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
    53         <meta name="x-apple-disable-message-reformatting">  <!-- Disable auto-scale in iOS 10 Mail entirely -->
    54         <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
    55 
    56         <!-- CSS Reset -->
    57         <style type="text/css">
    58                 /* What it does: Remove spaces around the email design added by some email clients. */
    59                 /* Beware: It can remove the padding / margin and add a background color to the compose a reply window. */
    60                 html,
    61                 body {
    62                         Margin: 0 !important;
    63                         padding: 0 !important;
    64                         height: 100% !important;
    65                         width: 100% !important;
    66                 }
    67 
    68                 /* What it does: Stops email clients resizing small text. */
    69                 * {
    70                         -ms-text-size-adjust: 100%;
    71                         -webkit-text-size-adjust: 100%;
    72                 }
    73 
    74                 /* What is does: Centers email on Android 4.4 */
    75                 div[style*="margin: 16px 0"] {
    76                         margin: 0 !important;
    77                 }
    78 
    79                 /* What it does: Stops Outlook from adding extra spacing to tables. */
    80                 table,
    81                 td {
    82                         mso-table-lspace: 0pt !important;
    83                         mso-table-rspace: 0pt !important;
    84                 }
    85 
    86                 /* What it does: Fixes webkit padding issue. Fix for Yahoo mail table alignment bug. Applies table-layout to the first 2 tables then removes for anything nested deeper. */
    87                 table {
    88                         border-spacing: 0 !important;
    89                         border-collapse: collapse !important;
    90                         table-layout: fixed !important;
    91                         Margin: 0 auto !important;
    92                 }
    93                 table table table {
    94                         table-layout: auto;
    95                 }
    96 
    97                 /* What it does: Uses a better rendering method when resizing images in IE. */
    98                 /* & manages img max widths to ensure content body images don't exceed template width. */
    99                 img {
    100                         -ms-interpolation-mode:bicubic;
    101                         height: auto;
    102                         max-width: 100%;
    103                 }
    104 
    105                 /* What it does: A work-around for email clients meddling in triggered links. */
    106                 *[x-apple-data-detectors],  /* iOS */
    107                 .x-gmail-data-detectors,    /* Gmail */
    108                 .x-gmail-data-detectors *,
    109                 .aBn {
    110                         border-bottom: 0 !important;
    111                         cursor: default !important;
    112                         color: inherit !important;
    113                         text-decoration: none !important;
    114                         font-size: inherit !important;
    115                         font-family: inherit !important;
    116                         font-weight: inherit !important;
    117                         line-height: inherit !important;
    118                 }
    119 
    120                 /* What it does: Prevents Gmail from displaying an download button on large, non-linked images. */
    121                 .a6S {
    122                         display: none !important;
    123                         opacity: 0.01 !important;
    124                 }
    125 
    126                 /* If the above doesn't work, add a .g-img class to any image in question. */
    127                         img.g-img + div {
    128                         display: none !important;
    129                 }
    130 
    131                 /* What it does: Prevents underlining the button text in Windows 10 */
    132                 .button-link {
    133                         text-decoration: none !important;
    134                 }
    135         </style>
    136 
    137 </head>
    138 <body class="email_bg" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="margin: 0; mso-line-height-rule: exactly;">
    139 <table cellpadding="0" cellspacing="0" border="0" height="100%" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="border-collapse:collapse;" class="email_bg"><tr><td valign="top">
    140         <center style="width: 100%; text-align: <?php echo esc_attr( $settings['direction'] ); ?>;">
    141 
    142                 <!-- Visually Hidden Preheader Text : BEGIN -->
    143                 <div style="display: none; font-size: 1px; line-height: 1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
    144                         {{email.preheader}}
    145                 </div>
    146                 <!-- Visually Hidden Preheader Text : END -->
    147 
    148                 <div style="max-width: 600px; margin: auto;" class="email-container">
    149                         <!--[if mso]>
    150                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="600" align="center">
    151                         <tr>
    152                         <td>
    153                         <![endif]-->
    154 
    155                         <!-- Email Header : BEGIN -->
    156                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
    157                                 <tr>
    158                                         <td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
    159                                                 <?php
    160                                                 /**
    161                                                  * Fires before the display of the email template header.
    162                                                  *
    163                                                  * @since 2.5.0
    164                                                  */
    165                                                 do_action( 'bp_before_email_header' );
    166 
    167                                                 echo bp_get_option( 'blogname' );
    168 
    169                                                 /**
    170                                                  * Fires after the display of the email template header.
    171                                                  *
    172                                                  * @since 2.5.0
    173                                                  */
    174                                                 do_action( 'bp_after_email_header' );
    175                                                 ?>
    176                                         </td>
    177                                 </tr>
    178                         </table>
    179                         <!-- Email Header : END -->
    180 
    181                         <!-- Email Body : BEGIN -->
    182                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
    183 
    184                                 <!-- 1 Column Text : BEGIN -->
    185                                 <tr>
    186                                         <td>
    187                                                 <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
    188                                                         <tr>
    189                                                                 <td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
    190                                                                         <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
    191                                                                         <hr color="<?php echo esc_attr( $settings['email_bg'] ); ?>"><br>
    192                                                                         {{{content}}}
    193                                                                 </td>
    194                                                         </tr>
    195                                                 </table>
    196                                         </td>
    197                                 </tr>
    198                                 <!-- 1 Column Text : BEGIN -->
    199 
    200                         </table>
    201                         <!-- Email Body : END -->
    202 
    203                         <!-- Email Footer : BEGIN -->
    204                         <br>
    205                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="<?php echo esc_attr( $settings['direction'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
    206                                 <tr>
    207                                         <td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: <?php echo esc_attr( $settings['direction'] ); ?>; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
    208                                                 <?php
    209                                                 /**
    210                                                  * Fires before the display of the email template footer.
    211                                                  *
    212                                                  * @since 2.5.0
    213                                                  */
    214                                                 do_action( 'bp_before_email_footer' );
    215                                                 ?>
    216 
    217                                                 <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
    218                                                 <br><br>
    219                                                 <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
    220 
    221                                                 <?php
    222                                                 /**
    223                                                  * Fires after the display of the email template footer.
    224                                                  *
    225                                                  * @since 2.5.0
    226                                                  */
    227                                                 do_action( 'bp_after_email_footer' );
    228                                                 ?>
    229                                         </td>
    230                                 </tr>
    231                         </table>
    232                         <!-- Email Footer : END -->
    233 
    234                         <!--[if mso]>
    235                         </td>
    236                         </tr>
    237                         </table>
    238                         <![endif]-->
    239                 </div>
    240         </center>
    241 </td></tr></table>
    242 <?php if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) wp_footer(); ?>
    243 </body>
    244 </html>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php
    deleted file mode 100644
    index aeae8075d..000000000
    + -  
    1 
    2                 <?php if ( bp_activity_embed_has_activity( bp_current_action() ) ) : ?>
    3 
    4                         <?php while ( bp_activities() ) : bp_the_activity(); ?>
    5                                 <div class="bp-embed-excerpt"><?php bp_activity_embed_excerpt(); ?></div>
    6 
    7                                 <?php bp_activity_embed_media(); ?>
    8 
    9                         <?php endwhile; ?>
    10 
    11                 <?php endif; ?>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
    deleted file mode 100644
    index 6214ab1d0..000000000
    + -  
    1                         <div class="wp-embed-footer">
    2                                 <?php the_embed_site_title() ?>
    3 
    4                                 <div class="wp-embed-meta">
    5                                         <?php
    6                                         /** This action is documented in wp-includes/theme-compat/embed-content.php */
    7                                         do_action( 'embed_content_meta' ); ?>
    8                                 </div>
    9                         </div>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php
    deleted file mode 100644
    index d668707fc..000000000
    + -  
    1 
    2                 <div id="bp-embed-header">
    3                         <div class="bp-embed-avatar">
    4                                 <a href="<?php bp_displayed_user_link(); ?>">
    5                                         <?php bp_displayed_user_avatar( 'type=thumb&width=45&height=45' ); ?>
    6                                 </a>
    7                         </div>
    8 
    9                         <?php if ( bp_activity_embed_has_activity( bp_current_action() ) ) : ?>
    10 
    11                                 <?php while ( bp_activities() ) : bp_the_activity(); ?>
    12                                         <p class="bp-embed-activity-action">
    13                                                 <?php bp_activity_action( array( 'no_timestamp' => true ) ); ?>
    14                                         </p>
    15                                 <?php endwhile; ?>
    16 
    17                         <?php endif; ?>
    18 
    19                         <p class="bp-embed-header-meta">
    20                                 <?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
    21                                         <span class="bp-embed-mentionname">@<?php bp_displayed_user_mentionname(); ?> &middot; </span>
    22                                 <?php endif; ?>
    23 
    24                                 <span class="bp-embed-timestamp"><a href="<?php bp_activity_thread_permalink(); ?>"><?php echo date_i18n( get_option( 'time_format' ) . ' - ' . get_option( 'date_format' ), strtotime( bp_get_activity_date_recorded() ) ); ?></a></span>
    25                         </p>
    26                 </div>
  • deleted file src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php

    diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php
    deleted file mode 100644
    index e3d012ebd..000000000
    + -  
    1 
    2                 <div id="bp-embed-header">
    3                         <div class="bp-embed-avatar">
    4                                 <a href="<?php bp_displayed_user_link(); ?>">
    5                                         <?php bp_displayed_user_avatar( 'type=thumb&width=36&height=36' ); ?>
    6                                 </a>
    7                         </div>
    8 
    9                         <p class="wp-embed-heading">
    10                                 <a href="<?php bp_displayed_user_link(); ?>">
    11                                         <?php bp_displayed_user_fullname(); ?>
    12                                 </a>
    13                         </p>
    14 
    15                         <?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
    16                                 <p class="bp-embed-mentionname">@<?php bp_displayed_user_mentionname(); ?></p>
    17                         <?php endif; ?>
    18                 </div>
  • src/class-buddypress.php

    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/camera.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php
    rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/camera.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/crop.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php
    rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/crop.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php
    rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/cover-images/index.php b/src/bp-templates/shared/buddypress/assets/_attachments/cover-images/index.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/cover-images/index.php
    rename to src/bp-templates/shared/buddypress/assets/_attachments/cover-images/index.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php b/src/bp-templates/shared/buddypress/assets/_attachments/uploader.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php
    rename to src/bp-templates/shared/buddypress/assets/_attachments/uploader.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php b/src/bp-templates/shared/buddypress/assets/emails/single-bp-email.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php
    rename to src/bp-templates/shared/buddypress/assets/emails/single-bp-email.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/activity.php b/src/bp-templates/shared/buddypress/assets/embeds/activity.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/activity.php
    rename to src/bp-templates/shared/buddypress/assets/embeds/activity.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/footer.php b/src/bp-templates/shared/buddypress/assets/embeds/footer.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/footer.php
    rename to src/bp-templates/shared/buddypress/assets/embeds/footer.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/header-activity.php b/src/bp-templates/shared/buddypress/assets/embeds/header-activity.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/header-activity.php
    rename to src/bp-templates/shared/buddypress/assets/embeds/header-activity.php
    diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/header.php b/src/bp-templates/shared/buddypress/assets/embeds/header.php
    similarity index 100%
    rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/header.php
    rename to src/bp-templates/shared/buddypress/assets/embeds/header.php
    diff --git a/src/class-buddypress.php b/src/class-buddypress.php
    index 7f328c3fc..f5118c8c4 100644
    a b class BuddyPress { 
    732732
    733733                // Register the basic theme stack. This is really dope.
    734734                bp_register_template_stack( 'get_stylesheet_directory', 10 );
    735                 bp_register_template_stack( 'get_template_directory',   12 );
    736                 bp_register_template_stack( 'bp_get_theme_compat_dir',  14 );
     735                bp_register_template_stack( 'get_template_directory', 12 );
     736                bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
     737                bp_register_template_stack( 'bp_get_shared_theme_assets_dir', 16 );
    737738        }
    738739
    739740        /**