<!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][6780] trunk/bp-core: Theme Compatibility:</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/6780">6780</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-02-10 23:57:50 +0000 (Sun, 10 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compatibility:
* When locating template files, filter 'bbp_get_template_stack' rather than 'bbp_get_template_part'
* Fixes bug where using bbp_locate_template() directly would result in missing subdirectory locations.
* Props r-a-y.
* Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4755">#4755</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpcorebpcoretemplateloaderphp">trunk/bp-core/bp-core-template-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (6779 => 6780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2013-02-08 18:36:14 UTC (rev 6779)
+++ trunk/bp-core/bp-core-filters.php 2013-02-10 23:57:50 UTC (rev 6780)
</span><span class="lines">@@ -58,12 +58,11 @@
</span><span class="cx"> * template hierarchy, start here by removing this filter, then look at how
</span><span class="cx"> * bp_template_include() works and do something similar. :)
</span><span class="cx"> */
</span><del>-add_filter( 'bp_template_include', 'bp_template_include_theme_supports', 2, 1 );
-add_filter( 'bp_template_include', 'bp_template_include_theme_compat', 4, 2 );
</del><ins>+add_filter( 'bp_template_include', 'bp_template_include_theme_supports', 2, 1 );
+add_filter( 'bp_template_include', 'bp_template_include_theme_compat', 4, 2 );
</ins><span class="cx">
</span><del>-// Run all template parts through additional template locations
-add_filter( 'bp_locate_template', 'bp_add_template_locations' );
-add_filter( 'bp_get_template_part', 'bp_add_template_locations' );
</del><ins>+// Filter BuddyPress template locations
+add_filter( 'bp_get_template_stack', 'bp_add_template_locations' );
</ins><span class="cx">
</span><span class="cx"> // Turn comments off for BuddyPress pages
</span><span class="cx"> add_filter( 'comments_open', 'bp_comments_open', 10, 2 );
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template-loader.php (6779 => 6780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template-loader.php 2013-02-08 18:36:14 UTC (rev 6779)
+++ trunk/bp-core/bp-core-template-loader.php 2013-02-10 23:57:50 UTC (rev 6780)
</span><span class="lines">@@ -278,21 +278,21 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> *
</span><del>- * @param array $templates
</del><ins>+ * @param array $stacks
</ins><span class="cx"> * @return array()
</span><span class="cx"> */
</span><del>-function bp_add_template_locations( $templates = array() ) {
</del><ins>+function bp_add_template_stack_locations( $stacks = array() ) {
</ins><span class="cx"> $retval = array();
</span><span class="cx">
</span><span class="cx"> // Get alternate locations
</span><del>- $locations = bp_get_template_locations( $templates );
</del><ins>+ $locations = bp_get_template_locations();
</ins><span class="cx">
</span><del>- // Loop through locations and templates and combine
- foreach ( (array) $locations as $location )
- foreach ( (array) $templates as $template )
- $retval[] = ltrim( trailingslashit( $location ) . $template, '/' );
</del><ins>+ // Loop through locations and stacks and combine
+ foreach ( (array) $stacks as $stack )
+ foreach ( (array) $locations as $custom_location )
+ $retval[] = untrailingslashit( trailingslashit( $stack ) . $custom_location );
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_add_template_locations', array_unique( $retval ), $templates );
</del><ins>+ return apply_filters( 'bp_add_template_stack_locations', array_unique( $locations ), $stacks );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>