Changeset 4004

Timestamp:

02/02/2011 06:31:42 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Prevent debug notice in the event $component is unset in bp_get_search_default_text

File:

• trunk/bp-core/bp-core-template.php (modified) (1 diff)

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

@@ -349 +349 @@
 
                 if ( empty( $component ) )
-                        $component = $bp->current_component;
+                        $component = bp_current_component();
 
                 $default_text = __( 'Search anything...', 'buddypress' );
 
                 // Most of the time, $component will be the actual component ID
-                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
-                        // name out of $bp->pages
-                        if ( !empty( $bp->pages->{$component}->slug ) ) {
-                                $key = $bp->pages->{$component}->slug;
-                                if ( !empty( $bp->{$key}->search_string ) )
-                                        $default_text = $bp->{$key}->search_string;
+                if ( !empty( $component ) ) {
+                        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
+                                // name out of $bp->pages
+                                if ( !empty( $bp->pages->{$component}->slug ) ) {
+                                        $key = $bp->pages->{$component}->slug;
+                                        if ( !empty( $bp->{$key}->search_string ) )
+                                                $default_text = $bp->{$key}->search_string;
+                                }
                         }
                 }