Changeset 41150

Timestamp:

07/25/2017 05:42:14 PM (7 years ago)

Author:

johnbillion

Message:

Users: Show a Super Admin label next to Super Admins on all user listing screens when the current user can manage network users.

Fixes #41165

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-users-list-table.php (modified) (1 diff)
• class-wp-users-list-table.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -244 +244 @@
         ?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo $user->user_login; ?></a><?php
         if ( in_array( $user->user_login, $super_admins ) ) {
-            echo ' - ' . __( 'Super Admin' );
+            echo ' &mdash; ' . __( 'Super Admin' );
         }
         ?></strong>

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -406 +406 @@
         $actions = array();
         $checkbox = '';
+        $super_admin = '';
+
+        if ( is_multisite() && current_user_can( 'manage_network_users' ) ) {
+            if ( in_array( $user_object->user_login, get_super_admins(), true ) ) {
+                $super_admin = ' — ' . __( 'Super Admin' );
+            }
+        }
+
         // Check if the user for this row is editable
         if ( current_user_can( 'list_users' ) ) {
@@ -412 +420 @@
 
             if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
-                $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
+                $edit = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
                 $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
             } else {
-                $edit = "<strong>$user_object->user_login</strong><br />";
+                $edit = "<strong>{$user_object->user_login}{$super_admin}</strong><br />";
             }
 
@@ -454 +462 @@
 
         } else {
-            $edit = '<strong>' . $user_object->user_login . '</strong>';
+            $edit = "<strong>{$user_object->user_login}{$super_admin}</strong>";
         }
         $avatar = get_avatar( $user_object->ID, 32 );