From 7c7eee01ef5edc0a6f0d365e10662a0641f1b45f Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Thu, 1 Oct 2015 20:58:24 +0000
Subject: [PATCH] MS: Remove registration of ID column in Sites and Users list
 tables.

Reverts a portion of [34289] and leaves the render for the column behind. A plugin can register these fields for display via filter.

Fixes #18661.

Built from https://develop.svn.wordpress.org/trunk@34750


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

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 149da6be94..176effc5b7 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -200,7 +200,6 @@ 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' ),
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 731467d97e..8e9dbdbbfd 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -149,7 +149,6 @@ 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' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 80bf66d9b4..d220e42195 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34749';
+$wp_version = '4.4-alpha-34750';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.