<!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][6404] 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/6404">6404</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2012-10-13 18:20:07 +0000 (Sat, 13 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compat:
* Remove bp_enable_theme_compat() function - as JJJ said, this function isn't needed. See https://buddypress.trac.wordpress.org/ticket/3741#comment:40
* Introduce bp_is_theme_bp_default() function - this checks to see if the current theme uses bp-default. Replace all instances of bp_enable_theme_compat() with bp_is_theme_bp_default()
* In bp-core-filters.php, switch out hardcoded locate_template() registration template checks for bp_has_custom_signup_page().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpcorebpcorethemecompatibilityphp">trunk/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpthemesbplegacybuddypressfunctionsphp">trunk/bp-themes/bp-legacy/buddypress-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (6403 => 6404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2012-10-13 07:36:37 UTC (rev 6403)
+++ trunk/bp-core/bp-core-catchuri.php 2012-10-13 18:20:07 UTC (rev 6404)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> $redirect_url .= $_SERVER['REQUEST_URI'];
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'mode' => bp_enable_theme_compat() ? 2 : 1, // 1 = $root, 2 = wp-login.php
</del><ins>+ 'mode' => bp_is_theme_bp_default() ? 1 : 2, // 1 = $root, 2 = wp-login.php
</ins><span class="cx"> 'redirect' => $redirect_url, // the URL you get redirected to when a user successfully logs in
</span><span class="cx"> 'root' => bp_get_root_domain(), // the landing page you get redirected to when a user doesn't have access
</span><span class="cx"> 'message' => __( 'You must log in to access the page you requested.', 'buddypress' )
</span></span></pre></div>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (6403 => 6404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2012-10-13 07:36:37 UTC (rev 6403)
+++ trunk/bp-core/bp-core-filters.php 2012-10-13 18:20:07 UTC (rev 6404)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> function bp_core_filter_user_welcome_email( $welcome_email ) {
</span><span class="cx">
</span><span class="cx"> // Don't touch the email if we don't have a custom registration template
</span><del>- if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
</del><ins>+ if ( ! bp_has_custom_signup_page() )
</ins><span class="cx"> return $welcome_email;
</span><span class="cx">
</span><span class="cx"> // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
</span><span class="cx">
</span><span class="cx"> // Don't touch the email if we don't have a custom registration template
</span><del>- if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
</del><ins>+ if ( ! bp_has_custom_signup_page() )
</ins><span class="cx"> return $welcome_email;
</span><span class="cx">
</span><span class="cx"> // [User Set] Replaces $password in welcome email; Represents value set by user
</span></span></pre></div>
<a id="trunkbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-theme-compatibility.php (6403 => 6404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-theme-compatibility.php 2012-10-13 07:36:37 UTC (rev 6403)
+++ trunk/bp-core/bp-core-theme-compatibility.php 2012-10-13 18:20:07 UTC (rev 6404)
</span><span class="lines">@@ -176,46 +176,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * See whether BuddyPress' theme compatibility is enabled or not.
</del><ins>+ * See whether the current theme is good ol' bp-default.
</ins><span class="cx"> *
</span><del>- * This differs from {@link bp_is_theme_compat_active()} as this function
- * checks to see if theme compat is enabled across the active blog.
- *
</del><span class="cx"> * @since BuddyPress (1.7)
</span><del>- * @uses wp_get_theme()
- * @uses apply_filters()
</del><ins>+ * @uses get_stylesheet()
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function bp_enable_theme_compat() {
-
- // default is theme compat should be enabled
- $retval = true;
-
- // get current theme
- $theme = wp_get_theme();
-
- // get current theme's tags
- $theme_tags = ! empty( $theme->tags ) ? $theme->tags : array();
-
- // check to see if the 'buddypress' tag is in the theme
- // or if stylesheet is 'bp-default'
- $backpat = in_array( 'buddypress', $theme_tags ) || $theme->get_stylesheet() == 'bp-default';
-
- // if we're already using a BP-compatible theme, disable theme compat
- if ( $backpat ) {
</del><ins>+function bp_is_theme_bp_default() {
+ if ( get_stylesheet() == 'bp-default' ) {
+ $retval = true;
+ } else {
</ins><span class="cx"> $retval = false;
</span><del>-
- // if theme compat should still be enabled, do some other checks
- // @todo what about themes that copied bp-default without using a child theme?
- } elseif ( $retval ) {
- // BP Template Pack check
- // if TPack exists, we should disable theme compat
- if ( function_exists( 'bp_tpack_theme_setup' ) ) {
- $retval = false;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'bp_enable_theme_compat', $retval );
</del><ins>+ return $retval;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (6403 => 6404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2012-10-13 07:36:37 UTC (rev 6403)
+++ trunk/bp-members/bp-members-template.php 2012-10-13 18:20:07 UTC (rev 6404)
</span><span class="lines">@@ -967,8 +967,9 @@
</span><span class="cx"> /** Signup Form ***************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_has_custom_signup_page() {
</span><del>- // if theme compat is enabled, we're already using our bundled templates
- if ( bp_enable_theme_compat() )
</del><ins>+ // if theme is not bp-default, theme compat is on
+ // theme compat already bundles its own templates
+ if ( ! bp_is_theme_bp_default() )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // look in parent / child theme for custom registration templates
</span></span></pre></div>
<a id="trunkbpthemesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-legacy/buddypress-functions.php (6403 => 6404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-legacy/buddypress-functions.php 2012-10-13 07:36:37 UTC (rev 6403)
+++ trunk/bp-themes/bp-legacy/buddypress-functions.php 2012-10-13 18:20:07 UTC (rev 6404)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> */
</span><span class="cx"> public function __construct() {
</span><span class="cx">
</span><del>- // Bail if theme compat should be disabled
- if ( ! bp_enable_theme_compat() )
</del><ins>+ // Bail if theme is a derivative of bp-default
+ if ( bp_is_theme_bp_default() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $this->setup_globals();
</span></span></pre>
</div>
</div>
</body>
</html>