Changeset 11841

Timestamp:

02/03/2018 07:08:39 PM (7 years ago)

Author:

djpaul

Message:

Template: remove shared folder pending further work.

See ​https://buddypress.trac.wordpress.org/ticket/7672#comment:11 for more details.

Reverts r11839, r11836, and r11835.

Location:

trunk/src

Files:

• bp-core/bp-core-attachments.php (modified) (1 diff)
• bp-core/bp-core-theme-compatibility.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php (copied) (copied from trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php)
• bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php (copied) (copied from trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php)
• bp-templates/bp-legacy/buddypress/assets/emails (copied) (copied from trunk/src/bp-templates/bp-legacy/buddypress/assets/emails)
• bp-templates/bp-legacy/buddypress/assets/embeds (copied) (copied from trunk/src/bp-templates/bp-legacy/buddypress/assets/embeds)
• bp-templates/bp-nouveau/buddypress/assets (copied) (copied from trunk/src/bp-templates/bp-nouveau/buddypress/assets)
• bp-templates/shared (deleted)
• class-buddypress.php (modified) (1 diff)

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 . '/shared/buddypress/' . $attachment_template_part . '.php';
+        $attachment_admin_template_part = buddypress()->themes_dir . '/bp-legacy/buddypress/' . $attachment_template_part . '.php';
 
         // Check whether the template part exists.

trunk/src/bp-core/bp-core-theme-compatibility.php

@@ -988 +988 @@
 }
 add_action( 'loop_end', 'bp_theme_compat_loop_end' );
-
-/**
- * Get the absolute path to the shared theme assets folder.
- *
- * @since 3.0.0
- *
- * @return string The absolute path to the shared theme assets folder.
- */
-function bp_get_shared_theme_assets_dir() {
-
-    /**
-     * Filters the absolute path to the shared theme assets folder.
-     *
-     * @since 3.0.0
-     *
-     * @param string $dir The absolute path to the shared theme assets folder.
-     */
-    return apply_filters( 'bp_get_theme_compat_dir', buddypress()->themes_dir . '/shared' );
-}

trunk/src/class-buddypress.php

@@ -733 +733 @@
         // Register the basic theme stack. This is really dope.
         bp_register_template_stack( 'get_stylesheet_directory', 10 );
-        bp_register_template_stack( 'get_template_directory', 12 );
-        bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
-        bp_register_template_stack( 'bp_get_shared_theme_assets_dir', 16 );
+        bp_register_template_stack( 'get_template_directory',   12 );
+        bp_register_template_stack( 'bp_get_theme_compat_dir',  14 );
     }