Ticket #2255: 2255.diff

bp-core/bp-core-templatetags.php

@@ -454 +454 @@
 function bp_directory_members_search_form() {
         global $bp;
 
-        $default_search_value = bp_get_search_default_text(); 
+        $default_search_value = bp_get_search_default_text();
         $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
 
         ?>
@@ -1022 +1022 @@
 
         $options = array();
 
+        $options['posts'] = __( 'Posts', 'buddypress' );
+
         if ( bp_is_active( 'xprofile' ) )
                 $options['members'] = __( 'Members', 'buddypress' );
 
@@ -1046 +1048 @@
         return apply_filters( 'bp_search_form_type_select', $selection_box );
 }
 
-/** 
- * 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 ) ) 
+/**
+ * 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];
@@ -1076 +1078 @@
                                         $default_text = $bp->default_search_strings[$key];
                         }
                 }
-                
-                return apply_filters( 'bp_search_default_text', $default_text, $component ); 
-        } 
 
+                return apply_filters( 'bp_search_default_text', $default_text, $component );
+        }
+
 function bp_search_form() {
         $form = '
                 <form action="' . bp_search_form_action() . '" method="post" id="search-form">
@@ -1155 +1157 @@
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
 
         preg_match( "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s", $text, $matches, PREG_OFFSET_CAPTURE, $excerpt_length );
-        
+
         if ( !empty( $matches ) ) {
-                $pos = array_pop( array_pop( $matches ) );      
+                $pos = array_pop( array_pop( $matches ) );
                 $text = substr( $text, 0, $pos ) . ' [...]';
         }
-        
+
         return apply_filters( 'bp_create_excerpt', $text, $original_text );
 }
 add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
@@ -2175 +2177 @@
         add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 )
 
 
-?>
- No newline at end of file
+?>

bp-core.php

@@ -169 +169 @@
                 $bp->current_component = $bp->default_component;
 
         // The default text for the members directory search box
-        $bp->default_search_strings[$bp->members->slug] = __( 'Search Members...', 'buddypress' ); 
+        $bp->default_search_strings[$bp->members->slug] = __( 'Search Members...', 'buddypress' );
 
         do_action( 'bp_core_setup_globals' );
 }
@@ -251 +251 @@
 
         if ( empty( $page_ids ) )
                 return false;
-                
+
         $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
 
         $page_ids_sql = implode( ',', (array)$page_ids );
@@ -1707 +1707 @@
 
         if ( empty( $slug ) ) {
                 switch ( $search_which ) {
+                        case 'posts':
+                                $slug = '';
+                                break;
                         case 'blogs':
                                 $slug = bp_is_active( 'blogs' )  ? $bp->blogs->slug  : '';
                                 break;
@@ -2163 +2166 @@
 
         bp_core_update_page_meta( $page_ids );
 }
-?>
- No newline at end of file
+?>