<!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][6399] 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/6399">6399</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2012-10-13 06:29:56 +0000 (Sat, 13 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compat:
* Introduce bp_enable_theme_compat() function - this should be used to see if theme compatibility is enabled.
* In BP_Legacy class, switch out template / stylesheet check for bp_enable_theme_compat().
* In bp_has_custom_signup_page(), use bp_enable_theme_compat(). Use bp_has_custom_signup_page() in bp_core_wpsignup_redirect().
* Change BBP references to BP.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorethemecompatibilityphp">trunk/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.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="trunkbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-theme-compatibility.php (6398 => 6399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-theme-compatibility.php 2012-10-10 20:30:59 UTC (rev 6398)
+++ trunk/bp-core/bp-core-theme-compatibility.php 2012-10-13 06:29:56 UTC (rev 6399)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> * extending this class.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><ins>+ * @todo We should probably do something similar to BP_Component::start()
</ins><span class="cx"> */
</span><span class="cx"> class BP_Theme_Compat {
</span><span class="cx">
</span><span class="lines">@@ -55,7 +56,7 @@
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> * @param array $properties
</span><span class="cx"> */
</span><del>- public function __construct( Array $properties = array() ) {
</del><ins>+ public function __construct( Array $properties = array() ) {
</ins><span class="cx"> $this->_data = $properties;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> * Setup the default theme compat theme
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><del>- * @param BBP_Theme_Compat $theme
</del><ins>+ * @param BP_Theme_Compat $theme
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_theme_compat( $theme = '' ) {
</span><span class="cx"> $bp = buddypress();
</span><span class="lines">@@ -175,11 +176,54 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Gets true/false if page is currently inside theme compatibility
</del><ins>+ * See whether BuddyPress' theme compatibility is enabled or not.
</ins><span class="cx"> *
</span><ins>+ * This differs from {@link bp_is_theme_compat_active()} as this function
+ * checks to see if theme compat is enabled across the active blog.
+ *
</ins><span class="cx"> * @since BuddyPress (1.7)
</span><ins>+ * @uses wp_get_theme()
+ * @uses apply_filters()
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><ins>+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 ) {
+ $retval = false;
+
+ // 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;
+ }
+ }
+
+ return apply_filters( 'bp_enable_theme_compat', $retval );
+}
+
+/**
+ * Gets true/false if the current, loaded page uses theme compatibility
+ *
+ * @since BuddyPress (1.7)
+ * @return bool
+ */
</ins><span class="cx"> function bp_is_theme_compat_active() {
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><span class="lines">@@ -269,7 +313,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_register_theme_package( $theme = array(), $override = true ) {
</span><span class="cx">
</span><del>- // Create new BBP_Theme_Compat object from the $theme array
</del><ins>+ // Create new BP_Theme_Compat object from the $theme array
</ins><span class="cx"> if ( is_array( $theme ) )
</span><span class="cx"> $theme = new BP_Theme_Compat( $theme );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (6398 => 6399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2012-10-10 20:30:59 UTC (rev 6398)
+++ trunk/bp-members/bp-members-functions.php 2012-10-13 06:29:56 UTC (rev 6399)
</span><span class="lines">@@ -1395,8 +1395,8 @@
</span><span class="cx"> if ( ! empty( $_SERVER['SCRIPT_NAME'] ) && false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && ( 'register' != $action ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Redirect to sign-up page
- if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
</del><ins>+ // Redirect to sign-up page if a custom signup page exists
+ if ( bp_has_custom_signup_page() )
</ins><span class="cx"> bp_core_redirect( bp_get_signup_page() );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_core_wpsignup_redirect' );
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (6398 => 6399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2012-10-10 20:30:59 UTC (rev 6398)
+++ trunk/bp-members/bp-members-template.php 2012-10-13 06:29:56 UTC (rev 6399)
</span><span class="lines">@@ -967,6 +967,11 @@
</span><span class="cx"> /** Signup Form ***************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_has_custom_signup_page() {
</span><ins>+ // if theme compat is enabled, we're already using our bundled templates
+ if ( bp_enable_theme_compat() )
+ return true;
+
+ // look in parent / child theme for custom registration templates
</ins><span class="cx"> if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-legacy/buddypress-functions.php (6398 => 6399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-legacy/buddypress-functions.php 2012-10-10 20:30:59 UTC (rev 6398)
+++ trunk/bp-themes/bp-legacy/buddypress-functions.php 2012-10-13 06:29:56 UTC (rev 6399)
</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 parent/child themes are bp-default
- if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) )
</del><ins>+ // Bail if theme compat should be disabled
+ if ( ! bp_enable_theme_compat() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $this->setup_globals();
</span></span></pre>
</div>
</div>
</body>
</html>