<!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][6439] trunk/bp-core: 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/6439">6439</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-10-22 07:08:52 +0000 (Mon, 22 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compat:
* Move 'bp_add_template_locations' filter from 'bp_get_template_part' to 'bp_locate_template'
* Allows for easier template location across multiple theme configurations.
* Revert part of r6394 in lieu of this method.
* See <a href="http://buddypress.trac.wordpress.org/ticket/3741">#3741</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 (6438 => 6439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2012-10-22 07:05:12 UTC (rev 6438)
+++ trunk/bp-core/bp-core-filters.php 2012-10-22 07:08:52 UTC (rev 6439)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> add_filter( 'bp_template_include', 'bp_template_include_theme_compat', 4, 2 );
</span><span class="cx">
</span><span class="cx"> // Run all template parts through additional template locations
</span><del>-add_filter( 'bp_get_template_part', 'bp_add_template_locations' );
</del><ins>+add_filter( 'bp_locate_template', '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 class="lines">@@ -238,8 +238,7 @@
</span><span class="cx"> // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
</span><span class="cx"> return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
</span><span class="cx"> }
</span><del>-if ( !is_admin() && empty( $_GET['e'] ) )
- add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
</del><ins>+add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * bp_core_filter_blog_welcome_email()
</span><span class="lines">@@ -263,8 +262,7 @@
</span><span class="cx"> // [User Set] Replaces $password in welcome email; Represents value set by user
</span><span class="cx"> return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
</span><span class="cx"> }
</span><del>-if ( !is_admin() && empty( $_GET['e'] ) )
- add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
</del><ins>+add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
</ins><span class="cx">
</span><span class="cx"> // Notify user of signup success.
</span><span class="cx"> function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta ) {
</span><span class="lines">@@ -295,8 +293,7 @@
</span><span class="cx"> // Return false to stop the original WPMU function from continuing
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-if ( !is_admin() )
- add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
</del><ins>+add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
</ins><span class="cx">
</span><span class="cx"> function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
</span><span class="cx">
</span><span class="lines">@@ -307,13 +304,9 @@
</span><span class="cx"> if ( empty( $admin_email ) )
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx">
</span><del>- // If this is an admin generated activation, add a param to email the
- // user login details
- $email = is_admin() ? '&e=1' : '';
-
</del><span class="cx"> $from_name = ( '' == get_site_option( 'site_name' ) ) ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
</span><del>- $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url . $email );
</del><ins>+ $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
</ins><span class="cx"> $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> // Send the message
</span><span class="lines">@@ -328,8 +321,7 @@
</span><span class="cx"> // Return false to stop the original WPMU function from continuing
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-if ( !is_admin() || ( is_admin() && empty( $_POST['noconfirmation'] ) ) )
- add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
</del><ins>+add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the page title for BuddyPress pages
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template-loader.php (6438 => 6439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template-loader.php 2012-10-22 07:05:12 UTC (rev 6438)
+++ trunk/bp-core/bp-core-template-loader.php 2012-10-22 07:08:52 UTC (rev 6439)
</span><span class="lines">@@ -66,6 +66,10 @@
</span><span class="cx"> $parent_theme = get_template_directory();
</span><span class="cx"> $fallback_theme = bp_get_theme_compat_dir();
</span><span class="cx">
</span><ins>+ // Allow templates to be filtered
+ // BuddyPress core automatically adds bp_add_template_locations()
+ $template_names = apply_filters( 'bp_locate_template', $template_names );
+
</ins><span class="cx"> // Try to find a template file
</span><span class="cx"> foreach ( (array) $template_names as $template_name ) {
</span><span class="cx">
</span><span class="lines">@@ -87,15 +91,9 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // Check theme compatibility last
</span><del>- } else {
- // 3rd-party plugin devs can hook into the 'bp_locate_fallback_template'
- // filter to load custom templates for their component if desired
- $fallback_template = apply_filters( 'bp_locate_fallback_template', trailingslashit( $fallback_theme ) . $template_name, $template_name );
-
- if ( file_exists( $fallback_template ) ) {
- $located = $fallback_template;
- break;
- }
</del><ins>+ } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
+ $located = trailingslashit( $fallback_theme ) . $template_name;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -203,9 +201,9 @@
</span><span class="cx"> $locations = bp_get_template_locations( $templates );
</span><span class="cx">
</span><span class="cx"> // Loop through locations and templates and combine
</span><del>- foreach ( $locations as $location )
- foreach ( $templates as $template )
- $retval[] = trailingslashit( $location ) . $template;
</del><ins>+ foreach ( (array) $locations as $location )
+ foreach ( (array) $templates as $template )
+ $retval[] = ltrim( trailingslashit( $location ) . $template, '/' );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_add_template_locations', $retval, $templates );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>