From b92955b427a8585fd9b382f80d14136f516f9f7d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 18 Sep 2015 15:58:25 +0000
Subject: [PATCH] Network Admin: Include IDs for users and sites on their
 respective views.

Props danielbachhuber, wonderboymusic.
Fixes #18661.
Built from https://develop.svn.wordpress.org/trunk@34289


git-svn-id: http://core.svn.wordpress.org/trunk@34253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-sites-list-table.php | 13 +++++++++++++
 wp-admin/includes/class-wp-ms-users-list-table.php | 13 +++++++++++++
 wp-includes/version.php                            |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index b5ec9a1725..56f9a07700 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -200,6 +200,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
+			'id'          => __( 'ID' ),
 			'blogname'    => __( 'URL' ),
 			'lastupdated' => __( 'Last Updated' ),
 			'registered'  => _x( 'Registered', 'site' ),
@@ -251,6 +252,18 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		<?php endif;
 	}
 
+	/**
+	 * Handles the ID column output.
+	 *
+	 * @since 4.4.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_id( $blog ) {
+		echo $blog['blog_id'];
+	}
+
 	/**
 	 * Handles the blogname column output.
 	 *
diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 1b2e558d88..6437a02807 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -148,6 +148,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	public function get_columns() {
 		$users_columns = array(
 			'cb'         => '<input type="checkbox" />',
+			'id'         => __( 'ID' ),
 			'username'   => __( 'Username' ),
 			'name'       => __( 'Name' ),
 			'email'      => __( 'Email' ),
@@ -196,6 +197,18 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		<?php
 	}
 
+	/**
+	 * Handles the ID column output.
+	 *
+	 * @since 4.4.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_id( $user ) {
+		echo $user->ID;
+	}
+
 	/**
 	 * Handles the username column output.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5b055aed39..b1cf7bff45 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34288';
+$wp_version = '4.4-alpha-34289';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.