Ticket #4949: 4949.patch

bp-core/bp-core-template-loader.php

@@ -108 +108 @@
  *
  * @param string $location Callback function that returns the stack location
  * @param int $priority
+ * @param string $path_type 'dir' for filesystem paths, 'uri' for URI paths
  */
-function bp_register_template_stack( $location_callback = '', $priority = 10 ) {
+function bp_register_template_stack( $location_callback = '', $priority = 10, $path_type = 'dir' ) {
 
         // Bail if no location, or function does not exist
-        if ( empty( $location_callback ) || ! function_exists( $location_callback ) )
+        if ( empty( $location_callback ) || ! is_callable( $location_callback ) )
                 return false;
 
+        $tag = 'uri' === $path_type ? 'bp_template_stack_uri' : 'bp_template_stack';
+
         // Add location callback to template stack
-        return add_filter( 'bp_template_stack', $location_callback, (int) $priority );
+        return add_filter( $tag, $location_callback, (int) $priority );
 }
 
 /**
@@ -128 +131 @@
  * @param int $priority
  * @see bp_register_template_stack()
  */
-function bp_deregister_template_stack( $location_callback = '', $priority = 10 ) {
+function bp_deregister_template_stack( $location_callback = '', $priority = 10, $path_type = 'dir' ) {
 
         // Bail if no location, or function does not exist
-        if ( empty( $location_callback ) || ! function_exists( $location_callback ) )
+        if ( empty( $location_callback ) || ! is_callable( $location_callback ) )
                 return false;
 
+        $tag = 'uri' === $path_type ? 'bp_template_stack_uri' : 'bp_template_stack';
+
         // Add location callback to template stack
-        return remove_filter( 'bp_template_stack', $location_callback, (int) $priority );
+        return remove_filter( $tag, $location_callback, (int) $priority );
 }
 
 /**
@@ -152 +157 @@
  *
  * @return array The filtered value after all hooked functions are applied to it.
  */
-function bp_get_template_stack() {
+function bp_get_template_stack( $path_type = 'dir' ) {
         global $wp_filter, $merged_filters, $wp_current_filter;
 
         // Setup some default variables
-        $tag  = 'bp_template_stack';
+        $tag  = 'uri' === $path_type ? 'bp_template_stack_uri' : 'bp_template_stack';
         $args = $stack = array();
 
         // Add 'bp_template_stack' to the current filter array
@@ -187 +192 @@
         // Remove empties and duplicates
         $stack = array_unique( array_filter( $stack ) );
 
-        return (array) apply_filters( 'bp_get_template_stack', $stack ) ;
+        return (array) apply_filters( 'bp_get_template_stack', $stack, $path_type ) ;
 }
 
 /**

bp-loader.php

@@ -256 +256 @@
 
                                         // get network-activated plugins
                                         $plugins = get_site_option( 'active_sitewide_plugins');
-                                        
+
                                         // basename
                                         $basename = plugin_basename( constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php' );
 
@@ -553 +553 @@
                 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( 'get_stylesheet_directory_uri', 10, 'uri' );
+                bp_register_template_stack( 'get_template_directory_uri',   12, 'uri' );
+                bp_register_template_stack( 'bp_get_theme_compat_url',  14, 'uri' );
         }
 
         /**

bp-templates/bp-legacy/buddypress-functions.php

@@ -197 +197 @@
                 // LTR or RTL
                 $file = is_rtl() ? 'css/buddypress-rtl.css' : 'css/buddypress.css';
 
+                $located            = false;
+                $template_locations = bp_get_template_stack( 'uri' );
+                var_dump( $template_locations );
+
+                foreach ( (array) $template_locations as $template_location ) {
+                        if ( empty( $template_location ) ) {
+                                continue;
+                        }
+
+                        if ( file_exists( trailingslashit( $template_location ) . $file ) ) {
+                                $located = trailingslashit( $template_location ) . $file;
+                                break;
+                        }
+                }
                 // Check child theme
                 if ( file_exists( trailingslashit( get_stylesheet_directory() ) . $file ) ) {
                         $location = trailingslashit( get_stylesheet_directory_uri() );