<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][6537] trunk: Theme Compat:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6537">6537</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-11-29 21:15:07 +0000 (Thu, 29 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compat:
* Literal merge of template stack code from bbPress 2.2.
* See <a href="http://buddypress.trac.wordpress.org/ticket/4656">#4656</a>.
* Does not include additional bp_template_stack_add_custom_locations() function in attached patch. This needs more testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplateloaderphp">trunk/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template-loader.php (6536 => 6537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template-loader.php 2012-11-27 09:57:13 UTC (rev 6536)
+++ trunk/bp-core/bp-core-template-loader.php 2012-11-29 21:15:07 UTC (rev 6537)
</span><span class="lines">@@ -61,17 +61,10 @@
</span><span class="cx"> function bp_locate_template( $template_names, $load = false, $require_once = true ) {
</span><span class="cx">
</span><span class="cx"> // No file found yet
</span><del>- $located = false;
- $child_theme = get_stylesheet_directory();
- $parent_theme = get_template_directory();
- $fallback_theme = bp_get_theme_compat_dir();
</del><ins>+ $located = false;
+ $template_locations = bp_get_template_stack();
</ins><span class="cx">
</span><del>- // Allow templates to be filtered
- // BuddyPress core automatically adds bp_add_template_locations()
- $template_names = apply_filters( 'bp_locate_template', $template_names );
-
</del><span class="cx"> // Try to find a template file
</span><del>- // Check the parent and child theme directories first
</del><span class="cx"> foreach ( (array) $template_names as $template_name ) {
</span><span class="cx">
</span><span class="cx"> // Continue if template is empty
</span><span class="lines">@@ -79,30 +72,24 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Trim off any slashes from the template name
</span><del>- $template_name = ltrim( $template_name, '/' );
</del><ins>+ $template_name = ltrim( $template_name, '/' );
</ins><span class="cx">
</span><del>- // Check child theme first
- if ( file_exists( trailingslashit( $child_theme ) . $template_name ) ) {
- $located = trailingslashit( $child_theme ) . $template_name;
- break;
</del><ins>+ // Loop through template stack
+ foreach ( (array) $template_locations as $template_location ) {
</ins><span class="cx">
</span><del>- // Check parent theme next
- } elseif ( file_exists( trailingslashit( $parent_theme ) . $template_name ) ) {
- $located = trailingslashit( $parent_theme ) . $template_name;
- break;
- }
- }
</del><ins>+ // Continue if $template_location is empty
+ if ( empty( $template_location ) )
+ continue;
</ins><span class="cx">
</span><del>- // Check theme compatibility last if no template is found in the current theme
- if ( empty( $located ) ) {
- foreach ( (array) $template_names as $template_name ) {
- if ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
- $located = trailingslashit( $fallback_theme ) . $template_name;
- break;
</del><ins>+ // Check child theme first
+ if ( file_exists( trailingslashit( $template_location ) . $template_name ) ) {
+ $located = trailingslashit( $template_location ) . $template_name;
+ break 2;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Maybe load the template if one was located
</ins><span class="cx"> if ( ( true == $load ) && !empty( $located ) )
</span><span class="cx"> load_template( $located, $require_once );
</span><span class="cx">
</span><span class="lines">@@ -110,6 +97,81 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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 bp_locate_template(), this allows for easy template overrides.
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param string $location Callback function that returns the
+ * @param int $priority
+ */
+function bp_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( 'bp_template_stack', $location_callback, (int) $priority );
+}
+
+/**
+ * Call the functions added to the 'bp_template_stack' filter hook, and return
+ * an array of the template locations.
+ *
+ * @see bp_register_template_stack()
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @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 bp_get_template_stack() {
+ global $wp_filter, $merged_filters, $wp_current_filter;
+
+ // Setup some default variables
+ $tag = 'bp_template_stack';
+ $args = $stack = array();
+
+ // Add 'bp_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 'bp_template_stack' filters, and call callback functions
+ do {
+ 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'] ) );
+ }
+ }
+ } while ( next( $wp_filter[$tag] ) !== false );
+
+ // Remove 'bp_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( 'bp_get_template_stack', $stack ) ;
+}
+
+/**
</ins><span class="cx"> * Get a template part in an output buffer, and return it
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (6536 => 6537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2012-11-27 09:57:13 UTC (rev 6536)
+++ trunk/bp-loader.php 2012-11-29 21:15:07 UTC (rev 6537)
</span><span class="lines">@@ -538,6 +538,8 @@
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="cx"> public function register_theme_packages() {
</span><ins>+
+ // Register the default theme compatibility package
</ins><span class="cx"> bp_register_theme_package( array(
</span><span class="cx"> 'id' => 'legacy',
</span><span class="cx"> 'name' => __( 'BuddyPress Default', 'buddypress' ),
</span><span class="lines">@@ -545,6 +547,11 @@
</span><span class="cx"> 'dir' => trailingslashit( $this->themes_dir . '/bp-legacy' ),
</span><span class="cx"> 'url' => trailingslashit( $this->themes_url . '/bp-legacy' )
</span><span class="cx"> ) );
</span><ins>+
+ // 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>