Changeset 34122 for trunk/src/wp-includes/admin-bar.php

Timestamp:

09/14/2015 05:09:58 PM (11 years ago)

Author:

johnbillion

Message:

Update links to the user profile editing screen in the admin toolbar when the current logged in user has no role on the current site. Covers single site and Multisite and introduces tests.

Fixes #25162

File:

• trunk/src/wp-includes/admin-bar.php (modified) (5 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -180 +180 @@
         $user_id      = get_current_user_id();
         $current_user = wp_get_current_user();
-        $profile_url  = get_edit_profile_url( $user_id );
 
         if ( ! $user_id )
                 return;
+
+        if ( current_user_can( 'read' ) ) {
+                $profile_url = get_edit_profile_url( $user_id );
+        } elseif ( is_multisite() ) {
+                $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+        } else {
+                $profile_url = false;
+        }
 
         $avatar = get_avatar( $user_id, 26 );
@@ -210 +217 @@
         $user_id      = get_current_user_id();
         $current_user = wp_get_current_user();
-        $profile_url  = get_edit_profile_url( $user_id );
 
         if ( ! $user_id )
                 return;
+
+        if ( current_user_can( 'read' ) ) {
+                $profile_url = get_edit_profile_url( $user_id );
+        } elseif ( is_multisite() ) {
+                $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+        } else {
+                $profile_url = false;
+        }
 
         $wp_admin_bar->add_group( array(
@@ -235 +249 @@
                 ),
         ) );
-        $wp_admin_bar->add_menu( array(
-                'parent' => 'user-actions',
-                'id'     => 'edit-profile',
-                'title'  => __( 'Edit My Profile' ),
-                'href' => $profile_url,
-        ) );
+
+        if ( false !== $profile_url ) {
+                $wp_admin_bar->add_menu( array(
+                        'parent' => 'user-actions',
+                        'id'     => 'edit-profile',
+                        'title'  => __( 'Edit My Profile' ),
+                        'href'   => $profile_url,
+                ) );
+        }
+
         $wp_admin_bar->add_menu( array(
                 'parent' => 'user-actions',
@@ -282 +300 @@
                 'id'    => 'site-name',
                 'title' => $title,
-                'href'  => is_admin() ? home_url( '/' ) : admin_url(),
+                'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
         ) );
 
@@ -305 +323 @@
                 }
 
-        } else {
+        } else if ( current_user_can( 'read' ) ) {
                 // We're on the front end, link to the Dashboard.
                 $wp_admin_bar->add_menu( array(