Changeset 3918

Timestamp:

01/25/2011 09:11:32 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix default search string regression from r3917

Location:

trunk/bp-core

Files:

• bp-core-component.php (modified) (1 diff)
• bp-core-template.php (modified) (2 diffs)

trunk/bp-core/bp-core-component.php

@@ -102 +102 @@
             'root_slug'             => '',
             'notification_callback' => '',
-            'global_tables'         => ''
+            'search_string'         => '',
+            'global_tables'         => '',
         );
         $r = wp_parse_args( $args, $defaults );
 
         // Slug used for permalinks
-        $this->slug      = apply_filters( 'bp_' . $this->id . '_slug',      $r['slug']      );
+        $this->slug          = apply_filters( 'bp_' . $this->id . '_slug',          $r['slug']          );
 
         // Slug used for root directory
-        $this->root_slug = apply_filters( 'bp_' . $this->id . '_root_slug', $r['root_slug'] );
+        $this->root_slug     = apply_filters( 'bp_' . $this->id . '_root_slug',     $r['root_slug']     );
+
+        // Search string
+        $this->search_string = apply_filters( 'bp_' . $this->id . '_search_string', $r['search_string'] );
 
         // Notifications callback

trunk/bp-core/bp-core-template.php

@@ -354 +354 @@
 
         // 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;
+        if ( !empty( $bp->{$component}->search_string ) ) {
+            $default_text = $bp->{$component}->search_string;
         } else {
             // When the request comes through AJAX, we need to get the component
@@ -361 +361 @@
             if ( !empty( $bp->pages->{$component}->slug ) ) {
                 $key = $bp->pages->{$component}->slug;
-                if ( !empty( $bp->{$key}->default_search_string ) )
-                    $default_text = $bp->{$key}->default_search_string;
+                if ( !empty( $bp->{$key}->search_string ) )
+                    $default_text = $bp->{$key}->search_string;
             }
         }