<!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][3829] trunk: Fix default_search_string globals so they do not interfere with ajax loading of component directories</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>3829</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-22 15:04:28 +0000 (Sat, 22 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix default_search_string globals so they do not interfere with ajax loading of component directories</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpforumsbpforumsloaderphp">trunk/bp-forums/bp-forums-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (3828 => 3829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2011-01-22 15:02:58 UTC (rev 3828)
+++ trunk/bp-core/bp-core-loader.php 2011-01-22 15:04:28 UTC (rev 3829)
</span><span class="lines">@@ -88,9 +88,6 @@
</span><span class="cx"> // Notifications Table
</span><span class="cx"> $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
</span><span class="cx">
</span><del>- // The default text for the members directory search box
- $bp->default_search_strings[$bp->members->slug] = __( 'Search Members...', 'buddypress' );
-
</del><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', 1 );
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (3828 => 3829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-01-22 15:02:58 UTC (rev 3828)
+++ trunk/bp-core/bp-core-template.php 2011-01-22 15:04:28 UTC (rev 3829)
</span><span class="lines">@@ -341,10 +341,10 @@
</span><span class="cx"> * @return string
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><del>-function bp_search_default_text() {
- echo bp_get_search_default_text();
</del><ins>+function bp_search_default_text( $component = '' ) {
+ echo bp_get_search_default_text( $component );
</ins><span class="cx"> }
</span><del>- function bp_get_search_default_text( $component = false ) {
</del><ins>+ function bp_get_search_default_text( $component = '' ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( empty( $component ) )
</span><span class="lines">@@ -352,20 +352,20 @@
</span><span class="cx">
</span><span class="cx"> $default_text = __( 'Search anything...', 'buddypress' );
</span><span class="cx">
</span><del>- 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];
</del><ins>+ // Most of the time, $component will be the actual component ID
+ if ( !empty( $bp->{$component}->default_search_string ) ) {
+ $default_text = $bp->{$component}->default_search_string;
</ins><span class="cx"> } else {
</span><del>- // When the request comes through AJAX, we need to get the component name
- // out of $bp->pages
</del><ins>+ // When the request comes through AJAX, we need to get the component
+ // name out of $bp->pages
</ins><span class="cx"> if ( !empty( $bp->pages->{$component}->slug ) ) {
</span><span class="cx"> $key = $bp->pages->{$component}->slug;
</span><del>- if ( !empty( $bp->default_search_strings[$key] ) )
- $default_text = $bp->default_search_strings[$key];
</del><ins>+ if ( !empty( $bp->{$key}->default_search_string ) )
+ $default_text = $bp->{$key}->default_search_string;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'bp_search_default_text', $default_text, $component );
</del><ins>+ return apply_filters( 'bp_get_search_default_text', $default_text, $component );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_search_form() {
</span></span></pre></div>
<a id="trunkbpforumsbpforumsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-loader.php (3828 => 3829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-loader.php 2011-01-22 15:02:58 UTC (rev 3828)
+++ trunk/bp-forums/bp-forums-loader.php 2011-01-22 15:04:28 UTC (rev 3829)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx"> if ( isset( $bp->site_options['bb-config-location'] ) )
</span><span class="cx"> $this->bbconfig = $bp->site_options['bb-config-location'];
</span><span class="cx">
</span><ins>+ // The default text for the blogs directory search box
+ $this->default_search_string = __( 'Search Forums...', 'buddypress' );
+
</ins><span class="cx"> // Register this in the active components array
</span><span class="cx"> $bp->active_components[$this->id] = $this->id;
</span><del>-
- // The default text for the blogs directory search box
- $bp->default_search_strings[$this->id] = __( 'Search Forums...', 'buddypress' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (3828 => 3829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2011-01-22 15:02:58 UTC (rev 3828)
+++ trunk/bp-groups/bp-groups-loader.php 2011-01-22 15:04:28 UTC (rev 3829)
</span><span class="lines">@@ -105,11 +105,11 @@
</span><span class="cx"> // Auto join group when non group member performs group activity
</span><span class="cx"> $this->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
+ $this->default_search_string = __( 'Search Groups...', 'buddypress' );
+
</ins><span class="cx"> // Register this in the active components array
</span><del>- $bp->active_components[$this->slug] = $this->id;
-
- // The default text for the groups directory search box
- $bp->default_search_strings[$this->slug] = __( 'Search Groups...', 'buddypress' );
</del><ins>+ $bp->active_components[$this->id] = $this->id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>