<!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][3830] trunk: More default_search_string fixes, this time for members and the forms themselves</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>3830</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-22 15:05:39 +0000 (Sat, 22 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More default_search_string fixes, this time for members and the forms themselves</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpusersbpusersloaderphp">trunk/bp-users/bp-users-loader.php</a></li>
<li><a href="#trunkbpusersbpusersscreensphp">trunk/bp-users/bp-users-screens.php</a></li>
<li><a href="#trunkbpusersbpuserstemplatephp">trunk/bp-users/bp-users-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (3829 => 3830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-01-22 15:04:28 UTC (rev 3829)
+++ trunk/bp-forums/bp-forums-template.php 2011-01-22 15:05:39 UTC (rev 3830)
</span><span class="lines">@@ -1032,16 +1032,17 @@
</span><span class="cx"> function bp_directory_forums_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $default_search_value = bp_get_search_default_text();
- $search_value = !empty( $_REQUEST['fs'] ) ? stripslashes( $_REQUEST['fs'] ) : $default_search_value;
</del><ins>+ $default_search_value = bp_get_search_default_text( 'forums' );
+ $search_value = !empty( $_REQUEST['fs'] ) ? stripslashes( $_REQUEST['fs'] ) : $default_search_value; ?>
</ins><span class="cx">
</span><del>-?>
</del><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 echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
- <input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</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>
+ <input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ); ?>" />
</ins><span class="cx"> </form>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> function bp_forum_permalink() {
</span><span class="cx"> echo bp_get_forum_permalink();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (3829 => 3830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-01-22 15:04:28 UTC (rev 3829)
+++ trunk/bp-groups/bp-groups-template.php 2011-01-22 15:05:39 UTC (rev 3830)
</span><span class="lines">@@ -1933,14 +1933,14 @@
</span><span class="cx"> function bp_directory_groups_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $default_search_value = bp_get_search_default_text();
- $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</del><ins>+ $default_search_value = bp_get_search_default_text( 'groups' );
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
</ins><span class="cx">
</span><del>-?>
</del><span class="cx"> <form action="" method="get" id="search-groups-form">
</span><span class="cx"> <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>
</span><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><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpusersbpusersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-users/bp-users-loader.php (3829 => 3830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-users/bp-users-loader.php 2011-01-22 15:04:28 UTC (rev 3829)
+++ trunk/bp-users/bp-users-loader.php 2011-01-22 15:05:39 UTC (rev 3830)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx"> $this->table_name = $bp->table_prefix . 'bp_users';
</span><span class="cx"> $this->table_name_meta = $bp->table_prefix . 'bp_users_meta';
</span><span class="cx">
</span><ins>+ // The default text for the members directory search box
+ $this->default_search_string = __( 'Search Members...', 'buddypress' );
+
</ins><span class="cx"> /** Logged in user ****************************************************/
</span><span class="cx">
</span><span class="cx"> // Logged in user is the 'current_user'
</span></span></pre></div>
<a id="trunkbpusersbpusersscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-users/bp-users-screens.php (3829 => 3830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-users/bp-users-screens.php 2011-01-22 15:04:28 UTC (rev 3829)
+++ trunk/bp-users/bp-users-screens.php 2011-01-22 15:05:39 UTC (rev 3830)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> function bp_users_screen_index() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( empty( $bp->displayed_user->id ) && $bp->current_component == $bp->members->root_slug ) {
</del><ins>+ if ( !bp_is_user() && bp_is_current_component( 'members' ) ) {
</ins><span class="cx"> $bp->is_directory = true;
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_users_screen_index' );
</span></span></pre></div>
<a id="trunkbpusersbpuserstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-users/bp-users-template.php (3829 => 3830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-users/bp-users-template.php 2011-01-22 15:04:28 UTC (rev 3829)
+++ trunk/bp-users/bp-users-template.php 2011-01-22 15:05:39 UTC (rev 3830)
</span><span class="lines">@@ -462,8 +462,8 @@
</span><span class="cx"> function bp_directory_members_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $default_search_value = bp_get_search_default_text();
- $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
</del><ins>+ $default_search_value = bp_get_search_default_text( 'members' );
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
</ins><span class="cx">
</span><span class="cx"> <form action="" method="get" id="search-members-form">
</span><span class="cx"> <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>
</span></span></pre>
</div>
</div>
</body>
</html>