<!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] [3068] branches/1.2: Fixes #1956</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3068</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-26 23:30:43 +0000 (Sat, 26 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1956</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#branches12bpthemesbpdefaultheaderphp">branches/1.2/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-templatetags.php (3067 => 3068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2010-06-22 13:13:31 UTC (rev 3067)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2010-06-26 23:30:43 UTC (rev 3068)
</span><span class="lines">@@ -994,6 +994,32 @@
</span><span class="cx"> return apply_filters( 'bp_get_activation_page', $page );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_search_form_available()
+ *
+ * Only show the search form if there are available objects to search for.
+ *
+ * @global array $bp
+ * @uses function_exists
+ * @uses bp_core_is_multisite()
+ * @return bool Filterable result
+ */
+function bp_search_form_enabled() {
+ global $bp;
+
+ if ( function_exists( 'xprofile_install' )
+ || function_exists( 'groups_install' )
+ || ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() )
+ || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
+ ) {
+ $search_enabled = true;
+ } else {
+ $search_enabled = false;
+ }
+
+ return apply_filters( 'bp_search_form_enabled', $search_enabled );
+}
+
</ins><span class="cx"> function bp_search_form_action() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/header.php (3067 => 3068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/header.php 2010-06-22 13:13:31 UTC (rev 3067)
+++ branches/1.2/bp-themes/bp-default/header.php 2010-06-26 23:30:43 UTC (rev 3068)
</span><span class="lines">@@ -84,14 +84,18 @@
</span><span class="cx"> <div id="search-bar">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><del>- <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
- <input type="text" id="search-terms" name="search-terms" value="" />
- <?php echo bp_search_form_type_select() ?>
</del><ins>+ <?php if ( bp_search_form_enabled() ) : ?>
</ins><span class="cx">
</span><del>- <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
- <?php wp_nonce_field( 'bp_search_form' ) ?>
- </form><!-- #search-form -->
</del><ins>+ <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+ <input type="text" id="search-terms" name="search-terms" value="" />
+ <?php echo bp_search_form_type_select() ?>
</ins><span class="cx">
</span><ins>+ <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+ <?php wp_nonce_field( 'bp_search_form' ) ?>
+ </form><!-- #search-form -->
+
+ <?php endif; ?>
+
</ins><span class="cx"> <?php do_action( 'bp_search_login_bar' ) ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .padder -->
</span></span></pre>
</div>
</div>
</body>
</html>