<!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][4172] trunk/bp-core: Add search posts option into the header search box.</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>4172</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-07 20:07:24 +0000 (Thu, 07 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add search posts option into the header search box. Fixes #2255, props PedroMiguel and sorich87.
Also fixes search handling which was broken.</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="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.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 (4171 => 4172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-04-06 22:30:37 UTC (rev 4171)
+++ trunk/bp-core/bp-core-catchuri.php 2011-04-07 20:07:24 UTC (rev 4172)
</span><span class="lines">@@ -186,9 +186,9 @@
</span><span class="cx"> if ( !empty( $bp_uri[0] ) && $root_profile = get_userdatabylogin( $bp_uri[0] ) ) {
</span><span class="cx">
</span><span class="cx"> // Force BP to recognize that this is a members page
</span><del>- $matches[] = 1;
- $match = $bp->pages->members;
- $match->key = 'members';
</del><ins>+ $matches[] = 1;
+ $match = $bp->pages->members;
+ $match->key = 'members';
</ins><span class="cx">
</span><span class="cx"> // Without the 'members' URL chunk, WordPress won't know which page to load
</span><span class="cx"> // This filter intercepts the WP query and tells it to load the members page
</span><span class="lines">@@ -199,8 +199,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Search doesn't have an associated page, so we check for it separately
</span><del>- if ( !empty( $bp_uri[0] ) && ( BP_SEARCH_SLUG == $bp_uri[0] ) )
- $matches[] = 1;
</del><ins>+ if ( !empty( $bp_uri[0] ) && ( BP_SEARCH_SLUG == $bp_uri[0] ) ) {
+ $matches[] = 1;
+ $match = new stdClass;
+ $match->key = 'search';
+ $match->slug = BP_SEARCH_SLUG;
+ }
</ins><span class="cx">
</span><span class="cx"> // This is not a BuddyPress page, so just return.
</span><span class="cx"> if ( !isset( $matches ) )
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4171 => 4172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-04-06 22:30:37 UTC (rev 4171)
+++ trunk/bp-core/bp-core-functions.php 2011-04-07 20:07:24 UTC (rev 4172)
</span><span class="lines">@@ -521,6 +521,11 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $slug ) ) {
</span><span class="cx"> switch ( $search_which ) {
</span><ins>+ case 'posts':
+ $slug = '';
+ $var = '/?s=';
+ break;
+
</ins><span class="cx"> case 'blogs':
</span><span class="cx"> $slug = bp_is_active( 'blogs' ) ? $bp->blogs->root_slug : '';
</span><span class="cx"> break;
</span><span class="lines">@@ -540,7 +545,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $slug ) ) {
</del><ins>+ if ( empty( $slug ) && 'posts' != $search_which ) {
</ins><span class="cx"> bp_core_redirect( bp_get_root_domain() );
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (4171 => 4172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-04-06 22:30:37 UTC (rev 4171)
+++ trunk/bp-core/bp-core-template.php 2011-04-07 20:07:24 UTC (rev 4172)
</span><span class="lines">@@ -337,6 +337,8 @@
</span><span class="cx"> if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() && !bp_forum_directory_is_disabled() )
</span><span class="cx"> $options['forums'] = __( 'Forums', 'buddypress' );
</span><span class="cx">
</span><ins>+ $options['posts'] = __( 'Posts', 'buddypress' );
+
</ins><span class="cx"> // Eventually this won't be needed and a page will be built to integrate all search results.
</span><span class="cx"> $selection_box = '<select name="search-which" id="search-which" style="width: auto">';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>