Changeset 4324

Timestamp:

11/03/2012 09:20:34 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Introduce bbp_get_template_stack() and bbp_register_template_stack().
• Used to provide an accurate hierarchy to individual template locations.
• Also enables an unlimited number of parent/child template relationships to be registered.
• See #1968.

Location:

trunk

Files:

• bbpress.php (modified) (3 diffs)
• includes/core/template-functions.php (modified) (1 diff)

trunk/bbpress.php

@@ -385 +385 @@
      */
     public function register_theme_packages() {
+
+        // Register the default theme compatibility package
         bbp_register_theme_package( array(
             'id'      => 'default',
@@ -392 +394 @@
             'url'     => trailingslashit( $this->themes_url . 'bbp-default' )
         ) );
+
+        // Register the basic theme stack. This is really dope.
+        bbp_register_template_stack( 'get_stylesheet_directory', 10 );
+        bbp_register_template_stack( 'get_template_directory',   12 );
+        bbp_register_template_stack( 'bbp_get_theme_compat_dir', 14 );
     }
 
@@ -803 +810 @@
 
     /**
-     * Register the bbPress capabilities
-     *
-     * @since bbPress (r3031)
-     *
-     * @uses BBP_Capabilities
-     */
-    public function register_capabilities() {
-        $this->capabilities = new BBP_Capabilities();
-    }
-
-    /**
      * Setup the currently logged-in user
      *

trunk/includes/core/template-functions.php

@@ -62 +62 @@
 
     // No file found yet
-    $located        = false;
-    $child_theme    = get_stylesheet_directory();
-    $parent_theme   = get_template_directory();
-    $fallback_theme = bbp_get_theme_compat_dir();
-
-    // Allow templates to be filtered
-    // Note: if you do this, be excellent to each other
-    $template_names = apply_filters( 'bbp_locate_template', $template_names );
-
-    // Try to find a template file
-    foreach ( (array) $template_names as $template_name ) {
-
-        // Continue if template is empty
-        if ( empty( $template_name ) )
+    $located = false;
+
+    // Loop through template stack
+    foreach ( (array) bbp_get_template_stack() as $template_location ) {
+
+        // Continue if $template_location is empty
+        if ( empty( $template_location ) )
             continue;
 
-        // Trim off any slashes from the template name
-        $template_name  = ltrim( $template_name, '/' );
-
-        // Check child theme first
-        if ( file_exists( trailingslashit( $child_theme ) . $template_name ) ) {
-            $located = trailingslashit( $child_theme ) . $template_name;
-            break;
-
-        // Check parent theme next
-        } elseif ( file_exists( trailingslashit( $parent_theme ) . $template_name ) ) {
-            $located = trailingslashit( $parent_theme ) . $template_name;
-            break;
-
-        // Check theme compatibility last
-        } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
-            $located = trailingslashit( $fallback_theme ) . $template_name;
-            break;
+        // Try to find a template file
+        foreach ( (array) $template_names as $template_name ) {
+
+            // Continue if template is empty
+            if ( empty( $template_name ) )
+                continue;
+
+            // Trim off any slashes from the template name
+            $template_name  = ltrim( $template_name, '/' );
+
+            // Check child theme first
+            if ( file_exists( trailingslashit( $template_location ) . $template_name ) ) {
+                $located = trailingslashit( $template_location ) . $template_name;
+                break;
+            }
         }
     }
 
+    // Maybe load the template if one was located
     if ( ( true == $load ) && !empty( $located ) )
         load_template( $located, $require_once );
 
     return $located;
+}
+
+/**
+ * This is really cool. This function registers a new template stack location,
+ * using WordPress's built in filters API.
+ *
+ * This allows for templates to live in places beyond just the parent/child
+ * relationship, to allow for custom template locations. Used in conjunction
+ * with bbp_locate_template(), this allows for easy template overrides.
+ *
+ * @since bbPress (r4323)
+ *
+ * @param string $location Callback function that returns the 
+ * @param int $priority
+ */
+function bbp_register_template_stack( $location_callback = '', $priority = 10 ) {
+
+    // Bail if no location, or function does not exist
+    if ( empty( $location_callback ) || ! function_exists( $location_callback ) )
+        return false;
+
+    // Add location callback to template stack
+    add_filter( 'bbp_template_stack', $location_callback, (int) $priority );
+}
+
+/**
+ * Call the functions added to the 'bbp_template_stack' filter hook, and return
+ * an array of the template locations.
+ *
+ * @see bbp_register_template_stack()
+ *
+ * @since bbPress (r4323)
+ *
+ * @global array $wp_filter Stores all of the filters
+ * @global array $merged_filters Merges the filter hooks using this function.
+ * @global array $wp_current_filter stores the list of current filters with the current one last
+ *
+ * @return array The filtered value after all hooked functions are applied to it.
+ */
+function bbp_get_template_stack() {
+    global $wp_filter, $merged_filters, $wp_current_filter;
+
+    // Setup some default variables
+    $tag  = 'bbp_template_stack';
+    $args = $stack = array();
+
+    // Add 'bbp_template_stack' to the current filter array
+    $wp_current_filter[] = $tag;
+
+    // Sort
+    if ( ! isset( $merged_filters[ $tag ] ) ) {
+        ksort( $wp_filter[$tag] );
+        $merged_filters[ $tag ] = true;
+    }
+
+    // Ensure we're always at the beginning of the filter array
+    reset( $wp_filter[ $tag ] );
+
+    // Loop through 'bbp_template_stack' filters, and call callback functions
+    while ( next( $wp_filter[$tag] ) !== false ) {
+        foreach( (array) current( $wp_filter[$tag] ) as $the_ ) {
+            if ( ! is_null( $the_['function'] ) ) {
+                $args[1] = $stack;
+                $stack[] = call_user_func_array( $the_['function'], array_slice( $args, 1, (int) $the_['accepted_args'] ) );
+            }
+        }
+    };
+
+    // Remove 'bbp_template_stack' from the current filter array
+    array_pop( $wp_current_filter );
+
+    // Remove empties and duplicates
+    $stack = array_unique( array_filter( $stack ) );
+
+    return (array) apply_filters( 'bbp_get_template_stack', $stack ) ;
 }