<!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][3627] trunk: Replaces generic 'Search anything' default directory search text with component-specific text.</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>3627</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-30 22:13:05 +0000 (Thu, 30 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replaces generic 'Search anything' default directory search text with component-specific text. Fixes #1915. Fixes ->forums->slug so that it is properly set in the bp_pages way</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -504,13 +504,12 @@
</span><span class="cx"> function bp_directory_blogs_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $search_value = __( 'Search anything...', 'buddypress' );
- if ( !empty( $_GET['s'] ) )
- $search_value = stripslashes( $_GET['s'] );
</del><ins>+ $default_search_value = bp_get_search_default_text();
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-blogs-form">
</span><del>- <label><input type="text" name="s" id="blogs_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</del><ins>+ <label><input type="text" name="s" id="blogs_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
</ins><span class="cx"> <input type="submit" id="blogs_search_submit" name="blogs_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-blogs.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> if ( !defined( 'BP_BLOGS_SLUG' ) )
</span><span class="cx"> define ( 'BP_BLOGS_SLUG', $bp->pages->blogs->slug );
</span><span class="cx">
</span><del>- /* For internal identification */
</del><ins>+ // For internal identification
</ins><span class="cx"> $bp->blogs->id = 'blogs';
</span><span class="cx">
</span><span class="cx"> $bp->blogs->slug = BP_BLOGS_SLUG;
</span><span class="lines">@@ -22,9 +22,12 @@
</span><span class="cx">
</span><span class="cx"> $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
</span><span class="cx">
</span><del>- /* Register this in the active components array */
</del><ins>+ // Register this in the active components array
</ins><span class="cx"> $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
</span><span class="cx">
</span><ins>+ // The default text for the blogs directory search box
+ $bp->default_search_strings[$bp->blogs->slug] = __( 'Search Blogs...', 'buddypress' );
+
</ins><span class="cx"> do_action( 'bp_blogs_setup_globals' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'bp_blogs_setup_globals' );
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-core/bp-core-templatetags.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -454,13 +454,12 @@
</span><span class="cx"> function bp_directory_members_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $search_value = __( 'Search anything...', 'buddypress' );
- if ( !empty( $_GET['s'] ) )
- $search_value = stripslashes( $_GET['s'] );
</del><ins>+ $default_search_value = bp_get_search_default_text();
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-members-form">
</span><del>- <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</del><ins>+ <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
</ins><span class="cx"> <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1048,6 +1047,40 @@
</span><span class="cx"> return apply_filters( 'bp_search_form_type_select', $selection_box );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Get the default text for the search box for a given component.
+ *
+ * @global object $bp BuddyPress global settings
+ * @return string
+ * @since 1.3
+ */
+function bp_search_default_text() {
+ echo bp_get_search_default_text();
+}
+ function bp_get_search_default_text( $component = false ) {
+ global $bp;
+
+ if ( empty( $component ) )
+ $component = $bp->current_component;
+
+ $default_text = __( 'Search anything...', 'buddypress' );
+
+ if ( !empty( $bp->default_search_strings[$component] ) ) {
+ // Most of the time, $component will be the actual component name
+ $default_text = $bp->default_search_strings[$component];
+ } else {
+ // When the request comes through AJAX, we need to get the component name
+ // out of $bp->pages
+ if ( !empty( $bp->pages->{$component}->slug ) ) {
+ $key = $bp->pages->{$component}->slug;
+ if ( !empty( $bp->default_search_strings[$key] ) )
+ $default_text = $bp->default_search_strings[$key];
+ }
+ }
+
+ return apply_filters( 'bp_search_default_text', $default_text, $component );
+ }
+
</ins><span class="cx"> function bp_search_form() {
</span><span class="cx"> $form = '
</span><span class="cx"> <form action="' . bp_search_form_action() . '" method="post" id="search-form">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-core.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -168,6 +168,9 @@
</span><span class="cx"> if ( !$bp->current_component && $bp->displayed_user->id )
</span><span class="cx"> $bp->current_component = $bp->default_component;
</span><span class="cx">
</span><ins>+ // The default text for the members directory search box
+ $bp->default_search_strings[$bp->members->slug] = __( 'Search Members...', 'buddypress' );
+
</ins><span class="cx"> do_action( 'bp_core_setup_globals' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'bp_core_setup_globals' );
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -1028,13 +1028,12 @@
</span><span class="cx"> function bp_directory_forums_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $search_value = __( 'Search anything...', 'buddypress' );
- if ( !empty( $_REQUEST['fs'] ) )
- $search_value = stripslashes( $_REQUEST['fs'] );
</del><ins>+ $default_search_value = bp_get_search_default_text();
+ $search_value = !empty( $_REQUEST['fs'] ) ? stripslashes( $_REQUEST['fs'] ) : $default_search_value;
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-forums-form">
</span><del>- <label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</del><ins>+ <label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
</ins><span class="cx"> <input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-forums.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -4,19 +4,25 @@
</span><span class="cx"> if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
</span><span class="cx"> define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
</span><span class="cx">
</span><del>-if ( !defined( 'BP_FORUMS_SLUG' ) )
- define( 'BP_FORUMS_SLUG', 'forums' );
-
</del><span class="cx"> if ( !defined( 'BB_PATH' ) )
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
</span><span class="cx">
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-templatetags.php' );
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
</span><span class="cx">
</span><ins>+/**
+ * Puts important forums component data into the $bp global for later use.
+ *
+ * @package BuddyPress Forums
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
</ins><span class="cx"> function bp_forums_setup() {
</span><span class="cx"> global $bp;
</span><ins>+
+ if ( !defined( 'BP_FORUMS_SLUG' ) )
+ define ( 'BP_FORUMS_SLUG', $bp->pages->forums->slug );
</ins><span class="cx">
</span><del>- /* For internal identification */
</del><ins>+ // For internal identification
</ins><span class="cx"> $bp->forums->id = 'forums';
</span><span class="cx">
</span><span class="cx"> $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
</span><span class="lines">@@ -25,9 +31,12 @@
</span><span class="cx"> if ( isset( $bp->site_options['bb-config-location'] ) )
</span><span class="cx"> $bp->forums->bbconfig = $bp->site_options['bb-config-location'];
</span><span class="cx">
</span><del>- /* Register this in the active components array */
</del><ins>+ // Register this in the active components array
</ins><span class="cx"> $bp->active_components[$bp->forums->slug] = $bp->forums->id;
</span><span class="cx">
</span><ins>+ // The default text for the forums directory search box
+ $bp->default_search_strings[$bp->forums->slug] = __( 'Search Forum Topics...', 'buddypress' );
+
</ins><span class="cx"> do_action( 'bp_forums_setup' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'bp_forums_setup' );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -1871,13 +1871,12 @@
</span><span class="cx"> function bp_directory_groups_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $search_value = __( 'Search anything...', 'buddypress' );
- if ( !empty( $_REQUEST['s'] ) )
- $search_value = stripslashes( $_REQUEST['s'] );
</del><ins>+ $default_search_value = bp_get_search_default_text();
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-groups-form">
</span><del>- <label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
</del><ins>+ <label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
</ins><span class="cx"> <input type="submit" id="groups_search_submit" name="groups_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-groups.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -4,8 +4,14 @@
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-widgets.php' );
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-filters.php' );
</span><span class="cx">
</span><ins>+/**
+ * Puts important groups component data into the $bp global for later use.
+ *
+ * @package BuddyPress Groups
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
</ins><span class="cx"> function groups_setup_globals() {
</span><del>- global $bp, $wpdb;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><span class="cx"> if ( !defined( 'BP_GROUPS_SLUG' ) )
</span><span class="cx"> define ( 'BP_GROUPS_SLUG', $bp->pages->groups->slug );
</span><span class="lines">@@ -40,6 +46,9 @@
</span><span class="cx"> // Auto join group when non group member performs group activity
</span><span class="cx"> $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
</span><span class="cx">
</span><ins>+ // The default text for the groups directory search box
+ $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
+
</ins><span class="cx"> do_action( 'groups_setup_globals' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'groups_setup_globals' );
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (3626 => 3627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-12-30 21:32:21 UTC (rev 3626)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-12-30 22:13:05 UTC (rev 3627)
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx"> if ( !empty( $_POST['page'] ) && '-1' != $_POST['page'] )
</span><span class="cx"> $qs[] = 'page=' . $_POST['page'];
</span><span class="cx">
</span><del>- if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
</del><ins>+ $object_search_text = bp_get_search_default_text( $object );
+ if ( !empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
</ins><span class="cx"> $qs[] = 'search_terms=' . $_POST['search_terms'];
</span><span class="cx">
</span><span class="cx"> /* Now pass the querystring to override default values. */
</span></span></pre>
</div>
</div>
</body>
</html>