<!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][5320] trunk: Move $bp_no_status_set global into $bp global, and more improvements to bp-core-catchuri.php.</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/5320">5320</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-11-09 06:54:53 +0000 (Wed, 09 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move $bp_no_status_set global into $bp global, and more improvements to bp-core-catchuri.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.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 (5319 => 5320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-11-09 06:38:28 UTC (rev 5319)
+++ trunk/bp-core/bp-core-catchuri.php 2011-11-09 06:54:53 UTC (rev 5320)
</span><span class="lines">@@ -399,10 +399,9 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function bp_core_catch_profile_uri() {
</span><del>- global $bp;
-
- if ( !bp_is_active( 'xprofile' ) )
</del><ins>+ if ( !bp_is_active( 'xprofile' ) ) {
</ins><span class="cx"> bp_core_load_template( apply_filters( 'bp_core_template_display_profile', 'members/single/home' ) );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -412,11 +411,11 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_core_catch_no_access() {
</span><del>- global $bp, $bp_no_status_set, $wp_query;
</del><ins>+ global $bp, $wp_query;
</ins><span class="cx">
</span><del>- // If bp_core_redirect() and $bp_no_status_set is true,
- // we are redirecting to an accessible page, so skip this check.
- if ( $bp_no_status_set )
</del><ins>+ // If coming from bp_core_redirect() and $bp_no_status_set is true,
+ // we are redirecting to an accessible page so skip this check.
+ if ( !empty( $bp->no_status_set ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !isset( $wp_query->queried_object ) && !bp_is_blog_page() ) {
</span><span class="lines">@@ -434,19 +433,21 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_core_no_access( $args = '' ) {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'mode' => '1', // 1 = $root, 2 = wp-login.php
</span><span class="cx"> 'message' => __( 'You must log in to access the page you requested.', 'buddypress' ),
</span><span class="cx"> 'redirect' => wp_guess_url(), // the URL you get redirected to when a user successfully logs in
</span><del>- 'root' => $bp->root_domain // the landing page you get redirected to when a user doesn't have access
</del><ins>+ 'root' => bp_get_root_domain() // the landing page you get redirected to when a user doesn't have access
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><ins>+ $r = apply_filters_ref_array( 'bp_core_no_access', $r );
</ins><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- // Apply filters to these variables
</del><ins>+ /**
+ * @ignore Ignore these filters and use 'bp_core_no_access' above
+ */
</ins><span class="cx"> $mode = apply_filters( 'bp_no_access_mode', $mode, $root, $redirect, $message );
</span><span class="cx"> $redirect = apply_filters( 'bp_no_access_redirect', $redirect, $root, $message, $mode );
</span><span class="cx"> $root = apply_filters( 'bp_no_access_root', $root, $redirect, $message, $mode );
</span><span class="lines">@@ -469,13 +470,12 @@
</span><span class="cx"> // Error message is displayed with bp_core_add_message()
</span><span class="cx"> case 1 :
</span><span class="cx"> default :
</span><del>- if ( $redirect ) {
</del><ins>+
+ $url = $root;
+ if ( !empty( $redirect ) )
</ins><span class="cx"> $url = add_query_arg( 'redirect_to', urlencode( $redirect ), $root );
</span><del>- } else {
- $url = $root;
- }
</del><span class="cx">
</span><del>- if ( $message ) {
</del><ins>+ if ( !empty( $message ) ) {
</ins><span class="cx"> bp_core_add_message( $message, 'error' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5319 => 5320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-11-09 06:38:28 UTC (rev 5319)
+++ trunk/bp-core/bp-core-functions.php 2011-11-09 06:54:53 UTC (rev 5320)
</span><span class="lines">@@ -830,16 +830,16 @@
</span><span class="cx"> * Performs a status safe wp_redirect() that is compatible with bp_catch_uri()
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp_no_status_set Makes sure that there are no conflicts with status_header() called in bp_core_do_catch_uri()
- * @uses get_themes()
- * @return An array containing all of the themes.
</del><ins>+ * @global BuddyPress $bp Makes sure that there are no conflicts with
+ * status_header() called in bp_core_do_catch_uri()
+ * @uses wp_redirect()
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_redirect( $location, $status = 302 ) {
</span><del>- global $bp_no_status_set;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><span class="cx"> // Make sure we don't call status_header() in bp_core_do_catch_uri()
</span><span class="cx"> // as this conflicts with wp_redirect()
</span><del>- $bp_no_status_set = true;
</del><ins>+ $bp->no_status_set = true;
</ins><span class="cx">
</span><span class="cx"> wp_redirect( $location, $status );
</span><span class="cx"> die;
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (5319 => 5320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2011-11-09 06:38:28 UTC (rev 5319)
+++ trunk/bp-loader.php 2011-11-09 06:54:53 UTC (rev 5320)
</span><span class="lines">@@ -154,7 +154,12 @@
</span><span class="cx"> * @see bp_core_set_uri_globals()
</span><span class="cx"> */
</span><span class="cx"> public $unfiltered_uri_offset = 0;
</span><del>-
</del><ins>+
+ /**
+ * @var bool Are status headers already sent?
+ */
+ public $no_status_set = false;
+
</ins><span class="cx"> /** Components ************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>