<!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][8830] trunk/src/bp-core: Fix `bp_is_current_component_core()` to reference BP core components.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8830">8830</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-08-13 19:56:31 +0000 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix `bp_is_current_component_core()` to reference BP core components.
`bp_is_current_component_core()` is a function that is meant to check
whether the current component is a BP bundled core component. This is done
by grabbing `bp_get_option( 'bp-active-components' )`, which is supposed to
hold only BP core components. However, if a plugin manually saves its
component in the `'bp-active-components'` DB option, our function will
now check this 3rd-party component as well, which is incorrect.
To address this issue, this commit introduces `bp_core_get_components()`,
which is a hardcoded array of BP core components, and references this
function in `bp_is_current_component_core()`. This ensures that only
BP core components are checked.
See <a href="http://buddypress.trac.wordpress.org/ticket/5552">#5552</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-functions.php (8829 => 8830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-functions.php 2014-08-13 19:27:20 UTC (rev 8829)
+++ trunk/src/bp-core/bp-core-functions.php 2014-08-13 19:56:31 UTC (rev 8830)
</span><span class="lines">@@ -338,6 +338,28 @@
</span><span class="cx"> /** Directory *****************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Returns an array of core components.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return array
+ */
+function bp_core_get_components() {
+ return array(
+ 'activity',
+ 'members',
+ 'groups',
+ 'blogs',
+ 'xprofile',
+ 'friends',
+ 'messages',
+ 'settings',
+ 'notifications',
+ 'forums',
+ );
+}
+
+/**
</ins><span class="cx"> * Fetch a list of BP directory pages from the appropriate meta table.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.5.0)
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-template.php (8829 => 8830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-template.php 2014-08-13 19:27:20 UTC (rev 8829)
+++ trunk/src/bp-core/bp-core-template.php 2014-08-13 19:56:31 UTC (rev 8830)
</span><span class="lines">@@ -1537,10 +1537,9 @@
</span><span class="cx"> * packaged components.
</span><span class="cx"> */
</span><span class="cx"> function bp_is_current_component_core() {
</span><del>- $retval = false;
- $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
</del><ins>+ $retval = false;
</ins><span class="cx">
</span><del>- foreach ( array_keys( $active_components ) as $active_component ) {
</del><ins>+ foreach ( bp_core_get_components() as $active_component ) {
</ins><span class="cx"> if ( bp_is_current_component( $active_component ) ) {
</span><span class="cx"> $retval = true;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>