<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3490] trunk: Modifies bp_core_set_uri_globals()
to properly catch search requests.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3490</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-28 15:49:00 +0000 (Sun, 28 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modifies bp_core_set_uri_globals() to properly catch search requests. Fixes #2710</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.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 (3489 => 3490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2010-11-28 13:13:27 UTC (rev 3489)
+++ trunk/bp-core/bp-core-catchuri.php 2010-11-28 15:49:00 UTC (rev 3490)
</span><span class="lines">@@ -139,7 +139,11 @@
</span><span class="cx">
</span><span class="cx"> unset( $uri_chunks );
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ // Search doesn't have an associated page, so we check for it separately
+ if ( BP_SEARCH_SLUG == $bp_uri[0] )
+ $matches[] = 1;
+
</ins><span class="cx"> // This is not a BuddyPress page, so just return.
</span><span class="cx"> if ( !isset( $matches ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3489 => 3490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-11-28 13:13:27 UTC (rev 3489)
+++ trunk/bp-core.php 2010-11-28 15:49:00 UTC (rev 3490)
</span><span class="lines">@@ -22,6 +22,10 @@
</span><span class="cx"> if ( !defined( 'CUSTOM_USER_META_TABLE' ) )
</span><span class="cx"> define( 'CUSTOM_USER_META_TABLE', $wpdb->base_prefix . 'usermeta' );
</span><span class="cx">
</span><ins>+// The search slug has to be defined nice and early because of the way search requests are loaded
+if ( !defined( 'BP_SEARCH_SLUG' ) )
+ define( 'BP_SEARCH_SLUG', 'search' );
+
</ins><span class="cx"> /* Load the files containing functions that we globally will need. */
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
</span><span class="lines">@@ -202,9 +206,6 @@
</span><span class="cx">
</span><span class="cx"> if ( !defined( 'BP_ACTIVATION_SLUG' ) )
</span><span class="cx"> define( 'BP_ACTIVATION_SLUG', $bp->pages->activate->slug );
</span><del>-
- if ( !defined( 'BP_SEARCH_SLUG' ) )
- define( 'BP_SEARCH_SLUG', 'search' );
</del><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'bp_core_define_slugs' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>