<!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][5818] trunk/bp-core/bp-core-catchuri.php: Remove trailing spaces from 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/5818">5818</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-21 02:22:22 +0000 (Tue, 21 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing spaces from bp-core-catchuri.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.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 (5817 => 5818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2012-02-21 02:18:49 UTC (rev 5817)
+++ trunk/bp-core/bp-core-catchuri.php 2012-02-21 02:22:22 UTC (rev 5818)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> // If running off blog other than root, any subdirectory names must be
</span><span class="cx"> // removed from $bp_uri. This includes two cases:
</span><del>- //
</del><ins>+ //
</ins><span class="cx"> // 1. when WP is installed in a subdirectory,
</span><span class="cx"> // 2. when BP is running on secondary blog of a subdirectory
</span><span class="cx"> // multisite installation. Phew!
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> unset( $bp_uri[$key] );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Reset the keys by merging with an empty array
</span><span class="cx"> $bp_uri = array_merge( array(), $bp_uri );
</span><span class="cx">
</span><span class="lines">@@ -316,17 +316,17 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Are root profiles enabled and allowed
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> * @return bool True if yes, false if no
</span><span class="cx"> */
</span><span class="cx"> function bp_core_enable_root_profiles() {
</span><del>-
</del><ins>+
</ins><span class="cx"> $retval = false;
</span><span class="cx">
</span><span class="cx"> if ( defined( 'BP_ENABLE_ROOT_PROFILES' ) && ( true == BP_ENABLE_ROOT_PROFILES ) )
</span><span class="cx"> $retval = true;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_enable_root_profiles', $retval );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set the root object as the current wp_query-ied item
</span><span class="cx"> $object_id = 0;
</span><span class="cx"> foreach ( (array) $bp->pages as $page ) {
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> $wp_query->queried_object_id = $object_id;
</span><span class="cx"> $post = $wp_query->queried_object;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Define local variables
</span><span class="cx"> $located_template = false;
</span><span class="cx"> $filtered_templates = array();
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> do_action( 'bp_core_pre_load_template', $located_template );
</span><span class="cx">
</span><span class="cx"> load_template( apply_filters( 'bp_load_template', $located_template ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'bp_core_post_load_template', $located_template );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_no_access( $args = '' ) {
</span><span class="cx">
</span><del>- // Build the redirect URL
</del><ins>+ // Build the redirect URL
</ins><span class="cx"> $redirect_url = is_ssl() ? 'https://' : 'http://';
</span><span class="cx"> $redirect_url .= $_SERVER['HTTP_HOST'];
</span><span class="cx"> $redirect_url .= $_SERVER['REQUEST_URI'];
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_redirect_canonical() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !bp_is_blog_page() && apply_filters( 'bp_do_redirect_canonical', true ) ) {
</span><span class="cx"> // If this is a POST request, don't do a canonical redirect.
</span><span class="cx"> // This is for backward compatibility with plugins that submit form requests to
</span><span class="lines">@@ -538,50 +538,50 @@
</span><span class="cx"> if ( !empty( $_POST ) ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // build the URL in the address bar
</span><span class="cx"> $requested_url = is_ssl() ? 'https://' : 'http://';
</span><span class="cx"> $requested_url .= $_SERVER['HTTP_HOST'];
</span><span class="cx"> $requested_url .= $_SERVER['REQUEST_URI'];
</span><del>-
</del><ins>+
</ins><span class="cx"> // Stash query args
</span><span class="cx"> $url_stack = explode( '?', $requested_url );
</span><span class="cx"> $req_url_clean = $url_stack[0];
</span><del>-
</del><ins>+
</ins><span class="cx"> // Process the redirect stack
</span><span class="cx"> if ( isset( $bp->redirect_stack['base_url'] ) ) {
</span><span class="cx"> $url_stack[0] = $bp->redirect_stack['base_url'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $bp->redirect_stack['component'] ) ) {
</span><span class="cx"> $url_stack[0] = trailingslashit( $url_stack[0] . $bp->redirect_stack['component'] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $bp->redirect_stack['action'] ) ) {
</span><span class="cx"> $url_stack[0] = trailingslashit( $url_stack[0] . $bp->redirect_stack['action'] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $bp->redirect_stack['action_variables'] ) ) {
</span><span class="cx"> foreach( (array) $bp->redirect_stack['action_variables'] as $av ) {
</span><del>- $url_stack[0] = trailingslashit( $url_stack[0] . $av );
</del><ins>+ $url_stack[0] = trailingslashit( $url_stack[0] . $av );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add trailing slash
</span><span class="cx"> $url_stack[0] = trailingslashit( $url_stack[0] );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Only redirect if we've assembled a URL different from the request
</span><span class="cx"> if ( $url_stack[0] !== $req_url_clean ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Template messages have been deleted from the cookie by this point, so
</span><span class="cx"> // they must be readded before redirecting
</span><span class="cx"> if ( isset( $bp->template_message ) ) {
</span><span class="cx"> $message = stripslashes( $bp->template_message );
</span><span class="cx"> $message_type = isset( $bp->template_message_type ) ? $bp->template_message_type : 'success';
</span><del>-
</del><ins>+
</ins><span class="cx"> bp_core_add_message( $message, $message_type );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> bp_core_redirect( implode( '?', $url_stack ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx"> * notice in future versions of BuddyPress.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><del>- * @uses bp_is_blog_page()
</del><ins>+ * @uses bp_is_blog_page()
</ins><span class="cx"> */
</span><span class="cx"> function _bp_maybe_remove_redirect_canonical() {
</span><span class="cx"> if ( ! bp_is_blog_page() )
</span></span></pre>
</div>
</div>
</body>
</html>