<!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][6866] trunk: Moves some core theme compatibility logic to the BP_Theme_Compat parent class</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/6866">6866</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-03-25 20:00:06 +0000 (Mon, 25 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moves some core theme compatibility logic to the BP_Theme_Compat parent class
Since every new BP template pack will need to do the same kinds of checks
before starting the theme compat process (is this a child theme of bp-default,
etc), it makes sense for a parent::start() method to handle the logic, rather
than requiring individual template packs to reproduce it in their child
classes.
In addition, this changeset introduces a fallback check for legacy BuddyPress
themes. For themes that are not child themes of bp-default and also have not
declared current_theme_supports( 'buddypress' ), BP_Theme_Compat::start() now
checks for the existence of members/members-loop.php in the current theme, and
if found, it interprets it as a sign that the current theme does indeed support
BuddyPress, and that theme compatibility should be aborted. Theme authors are
still urged to use current_theme_supports( 'buddypress' ) in their template
packs.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4869">#4869</a>
Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorethemecompatibilityphp">trunk/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/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 (6865 => 6866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-theme-compatibility.php 2013-03-25 19:38:56 UTC (rev 6865)
+++ trunk/bp-core/bp-core-theme-compatibility.php 2013-03-25 20:00:06 UTC (rev 6866)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> * );
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- private $_data = array();
</del><ins>+ protected $_data = array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Pass the $properties to the object on creation.
</span><span class="lines">@@ -60,7 +60,57 @@
</span><span class="cx"> $this->_data = $properties;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><ins>+ * Themes shoud use this method in their constructor.
+ *
+ * In this method, we check all types of conditions where theme compatibility
+ * should *not* run.
+ *
+ * If we pass all conditions, then we setup some additional methods to use.
+ *
+ * @since BuddyPress (1.7)
+ */
+ protected function start() {
+
+ // If the theme supports 'buddypress', bail.
+ if ( current_theme_supports( 'buddypress' ) ) {
+ return;
+
+ // If the theme doesn't support BP, do some additional checks
+ } else {
+ // Bail if theme is a derivative of bp-default
+ if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) ) {
+ return;
+ }
+
+ // Bruteforce check for a BP template
+ // Examples are clones of bp-default
+ if ( locate_template( 'members/members-loop.php', false, false ) ) {
+ return;
+ }
+ }
+
+ // Setup methods
+ $this->setup_globals();
+ $this->setup_actions();
+ }
+
+ /**
+ * Meant to be extended in your class.
+ *
+ * @since BuddyPress (1.7)
+ */
+ protected function setup_globals() {}
+
+ /**
+ * Meant to be extended in your class.
+ *
+ * @since BuddyPress (1.7)
+ */
+ protected function setup_actions() {}
+
+ /**
</ins><span class="cx"> * Set a theme's property.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (6865 => 6866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-03-25 19:38:56 UTC (rev 6865)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-03-25 20:00:06 UTC (rev 6866)
</span><span class="lines">@@ -45,35 +45,19 @@
</span><span class="cx"> * @uses BP_Legacy::setup_actions()
</span><span class="cx"> */
</span><span class="cx"> public function __construct() {
</span><del>-
- // Bail if theme is a derivative of bp-default
- if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) ) {
- return;
- }
-
- // Or if the theme supports 'buddypress'
- if ( current_theme_supports( 'buddypress' ) ) {
- return;
- }
-
- $this->setup_globals();
- $this->setup_actions();
</del><ins>+ parent::start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Component global variables
</span><span class="cx"> *
</span><del>- * Note that this function is currently commented out in the constructor.
- * It will only be used if you copy this file into your current theme and
- * uncomment the line above.
- *
</del><span class="cx"> * You'll want to customize the values in here, so they match whatever your
</span><span class="cx"> * needs are.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private function setup_globals() {
</del><ins>+ protected function setup_globals() {
</ins><span class="cx"> $bp = buddypress();
</span><span class="cx"> $this->id = 'legacy';
</span><span class="cx"> $this->name = __( 'BuddyPress Legacy', 'buddypress' );
</span><span class="lines">@@ -91,7 +75,7 @@
</span><span class="cx"> * @uses add_filter() To add various filters
</span><span class="cx"> * @uses add_action() To add various actions
</span><span class="cx"> */
</span><del>- private function setup_actions() {
</del><ins>+ protected function setup_actions() {
</ins><span class="cx">
</span><span class="cx"> // Template Output
</span><span class="cx"> add_filter( 'bp_get_activity_action_pre_meta', array( $this, 'secondary_avatars' ), 10, 2 );
</span></span></pre>
</div>
</div>
</body>
</html>