enmi-conf.org: comparison wp/wp-admin/includes/class-wp-users-list-table.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	protected function get_views() {
 		global $role;
 		$wp_roles = wp_roles();
+		$count_users = ! wp_is_large_user_count();
 		if ( $this->is_site_users ) {
 			$url = 'site-users.php?id=' . $this->site_id;
-			switch_to_blog( $this->site_id );
-			$users_of_blog = count_users( 'time', $this->site_id );
-			restore_current_blog();
 		} else {
-			$url           = 'users.php';
+			$url = 'users.php';
-			$users_of_blog = count_users();
+		}
-		}
+		$role_links              = array();
-		$total_users = $users_of_blog['total_users'];
+		$avail_roles             = array();
-		$avail_roles =& $users_of_blog['avail_roles'];
+		$all_text                = __( 'All' );
-		unset( $users_of_blog );
 		$current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
-		$role_links        = array();
+		if ( $count_users ) {
-		$role_links['all'] = sprintf(
+			if ( $this->is_site_users ) {
-			'<a href="%s"%s>%s</a>',
+				switch_to_blog( $this->site_id );
-			$url,
+				$users_of_blog = count_users( 'time', $this->site_id );
-			$current_link_attributes,
+				restore_current_blog();
-			sprintf(
+			} else {
+				$users_of_blog = count_users();
+			}
+			$total_users = $users_of_blog['total_users'];
+			$avail_roles =& $users_of_blog['avail_roles'];
+			unset( $users_of_blog );
+			$all_text = sprintf(
 				/* translators: %s: Number of users. */
 				_nx(
 					'All <span class="count">(%s)</span>',
 					'All <span class="count">(%s)</span>',
 					$total_users,
 					'users'
 				),
 				number_format_i18n( $total_users )
-			)
+			);
-		);
+		}
+		$role_links['all'] = sprintf( '<a href="%s"%s>%s</a>', $url, $current_link_attributes, $all_text );
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( ! isset( $avail_roles[ $this_role ] ) ) {
+			if ( $count_users && ! isset( $avail_roles[ $this_role ] ) ) {
 				continue;
 			}
 			$current_link_attributes = '';
 			if ( $this_role === $role ) {
 				$current_link_attributes = ' class="current" aria-current="page"';
 			}
 			$name = translate_user_role( $name );
-			$name = sprintf(
+			if ( $count_users ) {
-				/* translators: 1: User role name, 2: Number of users. */
+				$name = sprintf(
-				__( '%1$s <span class="count">(%2$s)</span>' ),
+					/* translators: 1: User role name, 2: Number of users. */
-				$name,
+					__( '%1$s <span class="count">(%2$s)</span>' ),
-				number_format_i18n( $avail_roles[ $this_role ] )
+					$name,
-			);
+					number_format_i18n( $avail_roles[ $this_role ] )
+				);
+			}
 			$role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
 		}
 		if ( ! empty( $avail_roles['none'] ) ) {
 			'cb'       => '<input type="checkbox" />',
 			'username' => __( 'Username' ),
 			'name'     => __( 'Name' ),
 			'email'    => __( 'Email' ),
 			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' ),
+			'posts'    => _x( 'Posts', 'post type general name' ),
 		);
 		if ( $this->is_site_users ) {
 			unset( $c['posts'] );
 		}
 		}
 		// Check if the user for this row is editable.
 		if ( current_user_can( 'list_users' ) ) {
 			// Set up the user editing link.
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
+			$edit_link = esc_url(
+				add_query_arg(
+					'wp_http_referer',
+					urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+					get_edit_user_link( $user_object->ID )
+				)
+			);
 			if ( current_user_can( 'edit_user', $user_object->ID ) ) {
 				$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}{$super_admin}</strong><br />";
 			}
-			if ( ! is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) {
+			if ( ! is_multisite()
+				&& get_current_user_id() !== $user_object->ID
+				&& current_user_can( 'delete_user', $user_object->ID )
+			) {
 				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . '</a>';
 			}
-			if ( is_multisite() && current_user_can( 'remove_user', $user_object->ID ) ) {
+			if ( is_multisite()
+				&& current_user_can( 'remove_user', $user_object->ID )
+			) {
 				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . '</a>';
 			}
 			// Add a link to the user's author archive, if not empty.
 			$author_posts_url = get_author_posts_url( $user_object->ID );
 					__( 'View' )
 				);
 			}
 			// Add a link to send the user a reset password link by email.
-			if ( get_current_user_id() !== $user_object->ID && current_user_can( 'edit_user', $user_object->ID ) ) {
+			if ( get_current_user_id() !== $user_object->ID
+				&& current_user_can( 'edit_user', $user_object->ID )
+			) {
 				$actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url( "users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Send password reset' ) . '</a>';
 			}
 			/**
 			 * Filters the action links displayed under each user in the Users list table.
 	protected function get_default_primary_column_name() {
 		return 'username';
 	}
 	/**
-	 * Returns an array of user roles for a given user object.
+	 * Returns an array of translated user role names for a given user object.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @param WP_User $user_object The WP_User object.
-	 * @return string[] An array of user roles.
+	 * @return string[] An array of user role names keyed by role.
 	 */
 	protected function get_role_list( $user_object ) {
 		$wp_roles = wp_roles();
 		$role_list = array();
 		if ( empty( $role_list ) ) {
 			$role_list['none'] = _x( 'None', 'no user roles' );
 		}
 		/**
-		 * Filters the returned array of roles for a user.
+		 * Filters the returned array of translated role names for a user.
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param string[] $role_list   An array of user roles.
+		 * @param string[] $role_list   An array of translated user role names keyed by role.
 		 * @param WP_User  $user_object A WP_User object.
 		 */
 		return apply_filters( 'get_role_list', $role_list, $user_object );
 	}

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6