Changeset 5134

Timestamp:

09/09/2011 09:10:47 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add missing _is_ functions for Settings component and introduce fallback template file in /bp-default/members/single/.

Fix issue where BuddyBar Settings links were incorrectly using displayed_user, even when no user was displayed.

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-settings/bp-settings-loader.php (modified) (1 diff)
• bp-themes/bp-default/members/single/home.php (modified) (1 diff)
• bp-themes/bp-default/members/single/settings.php (added)

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

@@ -1244 +1244 @@
 }
 
+/**
+ * Is this a user's settings page?
+ *
+ * @package BuddyPress
+ *
+ * @return bool
+ */
+function bp_is_user_settings() {
+        if ( bp_is_user() && bp_is_settings_component() )
+                return true;
+
+        return false;
+}
+
+/**
+ * Is this a user's General Settings page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_general() {
+        if ( bp_is_user_settings() && bp_is_current_action( 'general' ) )
+                return true;
+
+        return false;
+}
+
+/**
+ * Is this a user's Notification Settings page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_notifications() {
+        if ( bp_is_user_settings() && bp_is_current_action( 'notifications' ) )
+                return true;
+
+        return false;
+}
+
+/**
+ * Is this a user's Account Deletion page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_account_delete() {
+        if ( bp_is_user_settings() && bp_is_current_action( 'delete-account' ) )
+                return true;
+
+        return false;
+}
+
+
 /** Groups ******************************************************************/
 

trunk/bp-settings/bp-settings-loader.php

@@ -78 +78 @@
                 );
 
-                $settings_link = trailingslashit( $bp->displayed_user->domain . $this->slug );
+                // Determine user to use
+                if ( isset( $bp->displayed_user->domain ) )
+                        $user_domain = $bp->displayed_user->domain;
+                elseif ( isset( $bp->loggedin_user->domain ) )
+                        $user_domain = $bp->loggedin_user->domain;
+                else
+                        return;
+
+                $settings_link = trailingslashit( $user_domain . $this->slug );
 
                 // Add General Settings nav item

trunk/bp-themes/bp-default/members/single/home.php

@@ -40 +40 @@
 
                                 if ( bp_is_user_activity() || !bp_current_component() ) :
-                                        locate_template( array( 'members/single/activity.php' ), true );
+                                        locate_template( array( 'members/single/activity.php'  ), true );
 
                                  elseif ( bp_is_user_blogs() ) :
-                                        locate_template( array( 'members/single/blogs.php'    ), true );
+                                        locate_template( array( 'members/single/blogs.php'     ), true );
 
                                 elseif ( bp_is_user_friends() ) :
-                                        locate_template( array( 'members/single/friends.php'  ), true );
+                                        locate_template( array( 'members/single/friends.php'   ), true );
 
                                 elseif ( bp_is_user_groups() ) :
-                                        locate_template( array( 'members/single/groups.php'   ), true );
+                                        locate_template( array( 'members/single/groups.php'    ), true );
 
                                 elseif ( bp_is_user_messages() ) :
-                                        locate_template( array( 'members/single/messages.php' ), true );
+                                        locate_template( array( 'members/single/messages.php'  ), true );
 
                                 elseif ( bp_is_user_profile() ) :
-                                        locate_template( array( 'members/single/profile.php'  ), true );
+                                        locate_template( array( 'members/single/profile.php'   ), true );
 
                                 elseif ( bp_is_user_forums() ) :
-                                        locate_template( array( 'members/single/forums.php'  ), true );
+                                        locate_template( array( 'members/single/forums.php'    ), true );
+
+                                elseif ( bp_is_user_settings() ) :
+                                        locate_template( array( 'members/single/settings.php'  ), true );
 
                                 // If nothing sticks, load a generic template
                                 else :
-                                        locate_template( array( 'members/single/front.php'    ), true );
+                                        locate_template( array( 'members/single/plugins.php'   ), true );
 
                                 endif;