Changeset 41796

Timestamp:

10/09/2017 03:21:51 PM (7 years ago)

Author:

johnbillion

Message:

Users: Remove some links to the dashboard from My Sites for users who cannot access it.

See #41453

Location:

trunk/src

Files:

• wp-admin/my-sites.php (modified) (2 diffs)
• wp-includes/admin-bar.php (modified) (1 diff)

trunk/src/wp-admin/my-sites.php

@@ -109 +109 @@
 
     foreach ( $blogs as $user_blog ) {
+        switch_to_blog( $user_blog->userblog_id );
+
         echo "<li>";
         echo "<h3>{$user_blog->blogname}</h3>";
+
+        $actions = "<a href='" . esc_url( home_url() ). "'>" . __( 'Visit' ) . '</a>';
+
+        if ( current_user_can( 'read' ) ) {
+            $actions .= " | <a href='" . esc_url( admin_url() ) . "'>" . __( 'Dashboard' ) . '</a>';
+        }
+
         /**
          * Filters the row links displayed for each site on the My Sites screen.
@@ -116 +125 @@
          * @since MU (3.0.0)
          *
-         * @param string $string    The HTML site link markup.
+         * @param string $actions   The HTML site link markup.
          * @param object $user_blog An object containing the site data.
          */
-        echo "<p class='my-sites-actions'>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+        $actions = apply_filters( 'myblogs_blog_actions', $actions, $user_blog );
+        echo "<p class='my-sites-actions'>" . $actions . '</p>';
+
         /** This filter is documented in wp-admin/my-sites.php */
         echo apply_filters( 'myblogs_options', '', $user_blog );
         echo "</li>";
+
+        restore_current_blog();
     }?>
     </ul>

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

@@ -521 +521 @@
         $menu_id  = 'blog-' . $blog->userblog_id;
 
-        $wp_admin_bar->add_menu( array(
-            'parent'    => 'my-sites-list',
-            'id'        => $menu_id,
-            'title'     => $blavatar . $blogname,
-            'href'      => admin_url(),
-        ) );
-
-        $wp_admin_bar->add_menu( array(
-            'parent' => $menu_id,
-            'id'     => $menu_id . '-d',
-            'title'  => __( 'Dashboard' ),
-            'href'   => admin_url(),
-        ) );
+        if ( current_user_can( 'read' ) ) {
+            $wp_admin_bar->add_menu( array(
+                'parent'    => 'my-sites-list',
+                'id'        => $menu_id,
+                'title'     => $blavatar . $blogname,
+                'href'      => admin_url(),
+            ) );
+
+            $wp_admin_bar->add_menu( array(
+                'parent' => $menu_id,
+                'id'     => $menu_id . '-d',
+                'title'  => __( 'Dashboard' ),
+                'href'   => admin_url(),
+            ) );
+        } else {
+            $wp_admin_bar->add_menu( array(
+                'parent'    => 'my-sites-list',
+                'id'        => $menu_id,
+                'title'     => $blavatar . $blogname,
+                'href'      => home_url(),
+            ) );
+        }
 
         if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {