<!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][8182] trunk/bp-core/bp-core-functions.php: Replace `$bp` global touches in core component functions with `buddypress()` calls.</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/8182">8182</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-03-27 22:52:19 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace `$bp` global touches in core component functions with `buddypress()` calls. See <a href="http://buddypress.trac.wordpress.org/ticket/5138">#5138</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (8181 => 8182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2014-03-27 22:47:56 UTC (rev 8181)
+++ trunk/bp-core/bp-core-functions.php 2014-03-27 22:52:19 UTC (rev 8182)
</span><span class="lines">@@ -575,12 +575,21 @@
</span><span class="cx"> * Create WordPress pages to be used as BP component directories.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_create_root_component_page() {
</span><del>- global $bp;
</del><span class="cx">
</span><ins>+ // Get BuddyPress
+ $bp = buddypress();
+
</ins><span class="cx"> $new_page_ids = array();
</span><span class="cx">
</span><del>- foreach ( (array) $bp->add_root as $slug )
- $new_page_ids[$slug] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $slug ), 'post_status' => 'publish', 'post_type' => 'page' ) );
</del><ins>+ foreach ( (array) $bp->add_root as $slug ) {
+ $new_page_ids[ $slug ] = wp_insert_post( array(
+ 'comment_status' => 'closed',
+ 'ping_status' => 'closed',
+ 'post_title' => ucwords( $slug ),
+ 'post_status' => 'publish',
+ 'post_type' => 'page'
+ ) );
+ }
</ins><span class="cx">
</span><span class="cx"> $page_ids = array_merge( (array) $new_page_ids, (array) bp_core_get_directory_page_ids() );
</span><span class="cx"> bp_core_update_directory_page_ids( $page_ids );
</span><span class="lines">@@ -1160,14 +1169,15 @@
</span><span class="cx"> * Initializes {@link BP_Embed} after everything is loaded.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.5.0)
</span><del>- *
- * @global BuddyPress $bp BuddyPress global settings.
</del><span class="cx"> */
</span><span class="cx"> function bp_embed_init() {
</span><del>- global $bp;
</del><span class="cx">
</span><del>- if ( empty( $bp->embed ) )
</del><ins>+ // Get BuddyPress
+ $bp = buddypress();
+
+ if ( empty( $bp->embed ) ) {
</ins><span class="cx"> $bp->embed = new BP_Embed();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_embed_init', 9 );
</span><span class="cx">
</span><span class="lines">@@ -1346,9 +1356,7 @@
</span><span class="cx"> * @return int The root site ID.
</span><span class="cx"> */
</span><span class="cx"> function bp_get_root_blog_id() {
</span><del>- global $bp;
-
- return (int) apply_filters( 'bp_get_root_blog_id', (int) $bp->root_blog_id );
</del><ins>+ return (int) apply_filters( 'bp_get_root_blog_id', (int) buddypress()->root_blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1432,57 +1440,51 @@
</span><span class="cx"> /** Global Manipulators *******************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set the $bp->is_directory global.
</del><ins>+ * Set the "is_directory" global.
</ins><span class="cx"> *
</span><del>- * @global BuddyPress $bp The one true BuddyPress instance.
- *
</del><span class="cx"> * @param bool $is_directory Optional. Default: false.
</span><span class="cx"> * @param string $component Optional. Component name. Default: the current
</span><span class="cx"> * component.
</span><span class="cx"> */
</span><span class="cx"> function bp_update_is_directory( $is_directory = false, $component = '' ) {
</span><del>- global $bp;
</del><span class="cx">
</span><del>- if ( empty( $component ) )
</del><ins>+ if ( empty( $component ) ) {
</ins><span class="cx"> $component = bp_current_component();
</span><ins>+ }
</ins><span class="cx">
</span><del>- $bp->is_directory = apply_filters( 'bp_update_is_directory', $is_directory, $component );
</del><ins>+ buddypress()->is_directory = apply_filters( 'bp_update_is_directory', $is_directory, $component );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set the $bp->is_item_admin global.
</del><ins>+ * Set the "is_item_admin" global.
</ins><span class="cx"> *
</span><del>- * @global BuddyPress $bp The one true BuddyPress instance.
- *
</del><span class="cx"> * @param bool $is_item_admin Optional. Default: false.
</span><del>- * @param string $component. Optional. Component name. Default: the current
</del><ins>+ * @param string $component Optional. Component name. Default: the current
</ins><span class="cx"> * component.
</span><span class="cx"> */
</span><span class="cx"> function bp_update_is_item_admin( $is_item_admin = false, $component = '' ) {
</span><del>- global $bp;
</del><span class="cx">
</span><del>- if ( empty( $component ) )
</del><ins>+ if ( empty( $component ) ) {
</ins><span class="cx"> $component = bp_current_component();
</span><ins>+ }
</ins><span class="cx">
</span><del>- $bp->is_item_admin = apply_filters( 'bp_update_is_item_admin', $is_item_admin, $component );
</del><ins>+ buddypress()->is_item_admin = apply_filters( 'bp_update_is_item_admin', $is_item_admin, $component );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set the $bp->is_item_mod global.
</del><ins>+ * Set the "is_item_mod" global.
</ins><span class="cx"> *
</span><del>- * @global BuddyPress $bp The one true BuddyPress instance.
- *
</del><span class="cx"> * @param bool $is_item_mod Optional. Default: false.
</span><del>- * @param string $component. Optional. Component name. Default: the current
</del><ins>+ * @param string $component Optional. Component name. Default: the current
</ins><span class="cx"> * component.
</span><span class="cx"> */
</span><span class="cx"> function bp_update_is_item_mod( $is_item_mod = false, $component = '' ) {
</span><del>- global $bp;
</del><span class="cx">
</span><del>- if ( empty( $component ) )
</del><ins>+ if ( empty( $component ) ) {
</ins><span class="cx"> $component = bp_current_component();
</span><ins>+ }
</ins><span class="cx">
</span><del>- $bp->is_item_mod = apply_filters( 'bp_update_is_item_mod', $is_item_mod, $component );
</del><ins>+ buddypress()->is_item_mod = apply_filters( 'bp_update_is_item_mod', $is_item_mod, $component );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1504,8 +1506,9 @@
</span><span class="cx"> status_header( 404 );
</span><span class="cx"> nocache_headers();
</span><span class="cx">
</span><del>- if ( 'remove_canonical_direct' == $redirect )
</del><ins>+ if ( 'remove_canonical_direct' === $redirect ) {
</ins><span class="cx"> remove_action( 'template_redirect', 'redirect_canonical' );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Nonces ********************************************************************/
</span></span></pre>
</div>
</div>
</body>
</html>