<!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][3947] trunk/bp-core: Move $bp_pages global into $bp->pages global.</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>3947</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-27 06:42:12 +0000 (Thu, 27 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move $bp_pages global into $bp->pages global. Check empty() on table_prefix, root_domain, and site_options to allow manual overrides.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpcorebpcorewpabstractionphp">trunk/bp-core/bp-core-wpabstraction.php</a></li>
<li><a href="#trunkbpcoredeprecated13php">trunk/bp-core/deprecated/1.3.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 (3946 => 3947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-01-27 06:37:49 UTC (rev 3946)
+++ trunk/bp-core/bp-core-catchuri.php 2011-01-27 06:42:12 UTC (rev 3947)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function bp_core_set_uri_globals() {
</span><del>- global $bp, $bp_pages;
- global $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
</del><ins>+ global $bp, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
</ins><span class="cx"> global $current_blog;
</span><span class="cx">
</span><span class="cx"> // Create global component, action, and item variables
</span><span class="lines">@@ -42,8 +41,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fetch all the WP page names for each component
</span><del>- if ( empty( $bp_pages ) )
- $bp_pages = bp_core_get_page_names();
</del><ins>+ if ( empty( $bp->pages ) )
+ $bp->pages = bp_core_get_page_names();
</ins><span class="cx">
</span><span class="cx"> // Ajax or not?
</span><span class="cx"> if ( strpos( $_SERVER['REQUEST_URI'], 'wp-load.php' ) )
</span><span class="lines">@@ -118,7 +117,7 @@
</span><span class="cx"> $bp_unfiltered_uri = $bp_uri;
</span><span class="cx">
</span><span class="cx"> // Find a match within registered BuddyPress controlled WP pages (check members first)
</span><del>- foreach ( (array)$bp_pages as $page_key => $bp_page ) {
</del><ins>+ foreach ( (array)$bp->pages as $page_key => $bp_page ) {
</ins><span class="cx"> if ( in_array( $bp_page->name, (array)$bp_uri ) ) {
</span><span class="cx"> // Match found, now match the slug to make sure.
</span><span class="cx"> $uri_chunks = explode( '/', $bp_page->slug );
</span></span></pre></div>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (3946 => 3947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2011-01-27 06:37:49 UTC (rev 3946)
+++ trunk/bp-core/bp-core-loader.php 2011-01-27 06:42:12 UTC (rev 3947)
</span><span class="lines">@@ -34,18 +34,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _setup_globals() {
</span><del>- global $bp, $bp_pages;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><ins>+ /** Database **********************************************************/
+
</ins><span class="cx"> // Get the base database prefix
</span><del>- $bp->table_prefix = bp_core_get_table_prefix();
</del><ins>+ if ( empty( $bp->table_prefix ) )
+ $bp->table_prefix = bp_core_get_table_prefix();
</ins><span class="cx">
</span><span class="cx"> // The domain for the root of the site where the main blog resides
</span><del>- $bp->root_domain = bp_core_get_root_domain();
</del><ins>+ if ( empty( $bp->root_domain ) )
+ $bp->root_domain = bp_core_get_root_domain();
</ins><span class="cx">
</span><ins>+ // Fetches all of the core BuddyPress settings in one fell swoop
+ if ( empty( $bp->site_options ) )
+ $bp->site_options = bp_core_get_site_options();
+
</ins><span class="cx"> // The names of the core WordPress pages used to display BuddyPress content
</span><del>- $bp->pages = $bp_pages;
</del><ins>+ if ( empty( $bp->pages ) )
+ $bp->pages = bp_core_get_page_names();
</ins><span class="cx">
</span><del>- /** Component and Action **************************************************/
</del><ins>+ /** Component and Action **********************************************/
</ins><span class="cx">
</span><span class="cx"> // Used for overriding the 2nd level navigation menu so it can be used to
</span><span class="cx"> // display custom navigation for an item (for example a group)
</span><span class="lines">@@ -62,9 +71,6 @@
</span><span class="cx"> $bp->default_component = BP_DEFAULT_COMPONENT;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Fetches all of the core BuddyPress settings in one fell swoop
- $bp->site_options = bp_core_get_site_options();
-
</del><span class="cx"> // Sets up the array container for the component navigation rendered
</span><span class="cx"> // by bp_get_nav()
</span><span class="cx"> $bp->bp_nav = array();
</span><span class="lines">@@ -77,7 +83,7 @@
</span><span class="cx"> // value the internal ID of the component.
</span><span class="cx"> $bp->active_components = array();
</span><span class="cx">
</span><del>- /** Basic current user data ***********************************************/
</del><ins>+ /** Basic current user data *******************************************/
</ins><span class="cx">
</span><span class="cx"> // Logged in user is the 'current_user'
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="lines">@@ -85,7 +91,7 @@
</span><span class="cx"> // The user ID of the user who is currently logged in.
</span><span class="cx"> $bp->loggedin_user->id = $current_user->ID;
</span><span class="cx">
</span><del>- /** Avatars ***************************************************************/
</del><ins>+ /** Avatars ***********************************************************/
</ins><span class="cx">
</span><span class="cx"> // Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar
</span><span class="cx"> $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', $bp->site_options['avatar_default'] );
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (3946 => 3947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2011-01-27 06:37:49 UTC (rev 3946)
+++ trunk/bp-core/bp-core-wpabstraction.php 2011-01-27 06:42:12 UTC (rev 3947)
</span><span class="lines">@@ -13,6 +13,8 @@
</span><span class="cx"> * Only add abstraction functions if WordPress is not in multisite mode
</span><span class="cx"> */
</span><span class="cx"> if ( !is_multisite() ) {
</span><ins>+ global $wpdb;
+
</ins><span class="cx"> $wpdb->base_prefix = $wpdb->prefix;
</span><span class="cx"> $wpdb->blogid = 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcoredeprecated13php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.3.php (3946 => 3947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.3.php 2011-01-27 06:37:49 UTC (rev 3946)
+++ trunk/bp-core/deprecated/1.3.php 2011-01-27 06:42:12 UTC (rev 3947)
</span><span class="lines">@@ -300,16 +300,16 @@
</span><span class="cx"> * @global $bp BuddyPress global settings
</span><span class="cx"> */
</span><span class="cx"> function bp_core_add_root_component( $slug ) {
</span><del>- global $bp, $bp_pages;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><span class="cx"> _deprecated_function( __FUNCTION__, '1.3', 'wp_insert_post()' );
</span><del>- if ( empty( $bp_pages ) )
- $bp_pages = bp_core_get_page_names();
</del><ins>+ if ( empty( $bp->pages ) )
+ $bp->pages = bp_core_get_page_names();
</ins><span class="cx">
</span><span class="cx"> $match = false;
</span><span class="cx">
</span><span class="cx"> // Check if the slug is registered in the $bp->pages global
</span><del>- foreach ( (array)$bp_pages as $key => $page ) {
</del><ins>+ foreach ( (array)$bp->pages as $key => $page ) {
</ins><span class="cx"> if ( $key == $slug || $page->slug == $slug )
</span><span class="cx"> $match = true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>