Changeset 3918 for branches/plugin/bbp-includes/bbp-user-functions.php

Timestamp:

05/22/2012 09:52:50 AM (13 years ago)

Author:

johnjamesjacoby

Message:

User Edit:

• Add missing bbp_is_user_home_edit() function and use where appropriate.
• Add bbp_is_user_home_edit() checks to is_bbpress() and body class.

File:

• branches/plugin/bbp-includes/bbp-user-functions.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-user-functions.php

@@ -881 +881 @@
 
     // Execute confirmed email change. See send_confirmation_on_profile_email().
-    if ( is_multisite() && bbp_is_user_home() && isset( $_GET['newuseremail'] ) ) {
+    if ( is_multisite() && bbp_is_user_home_edit() && isset( $_GET['newuseremail'] ) ) {
 
         $new_email = get_option( $user_id . '_new_email' );
@@ -900 +900 @@
         }
 
-    } elseif ( is_multisite() && bbp_is_user_home() && !empty( $_GET['dismiss'] ) && ( $user_id . '_new_email' == $_GET['dismiss'] ) ) {
+    } elseif ( is_multisite() && bbp_is_user_home_edit() && !empty( $_GET['dismiss'] ) && ( $user_id . '_new_email' == $_GET['dismiss'] ) ) {
 
         delete_option( $user_id . '_new_email' );
@@ -914 +914 @@
 
     // Do action based on who's profile you're editing
-    $edit_action = bbp_is_user_home() ? 'personal_options_update' : 'edit_user_profile_update';
+    $edit_action = bbp_is_user_home_edit() ? 'personal_options_update' : 'edit_user_profile_update';
     do_action( $edit_action, $user_id );
 
@@ -949 +949 @@
         }
 
-        if ( is_multisite() && is_network_admin() & !bbp_is_user_home() && current_user_can( 'manage_network_options' ) && !isset( $super_admins ) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
+        if ( is_multisite() && is_network_admin() & !bbp_is_user_home_edit() && current_user_can( 'manage_network_options' ) && !isset( $super_admins ) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
             empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
         }
@@ -1397 +1397 @@
 
     // Only allow super admins on multisite to edit every user.
-    if ( !is_user_logged_in() || ( is_multisite() && !current_user_can( 'manage_network_users' ) && bbp_is_user_home() && !apply_filters( 'enable_edit_any_user_configuration', true ) ) || !current_user_can( 'edit_user', bbp_get_displayed_user_id() ) ) {
+    if ( !is_user_logged_in() || ( is_multisite() && !current_user_can( 'manage_network_users' ) && bbp_is_user_home_edit() && !apply_filters( 'enable_edit_any_user_configuration', true ) ) || !current_user_can( 'edit_user', bbp_get_displayed_user_id() ) ) {
         wp_safe_redirect( bbp_get_user_profile_url( bbp_get_displayed_user_id() ) );
         exit();