<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41753] trunk/src: Users: Revert [41613], [41614], and [41623] as this feature needs some more work.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41753">41753</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41753","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-04 22:16:21 +0000 (Wed, 04 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Users: Revert <a href="https://core.trac.wordpress.org/changeset/41613">[41613]</a>, <a href="https://core.trac.wordpress.org/changeset/41614">[41614]</a>, and <a href="https://core.trac.wordpress.org/changeset/41623">[41623]</a> as this feature needs some more work.
See <a href="https://core.trac.wordpress.org/ticket/38741">#38741</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2017-10-04 21:00:15 UTC (rev 41752)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2017-10-04 22:16:21 UTC (rev 41753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,49 +166,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $role;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles = wp_roles();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count_users = true;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_is_large_user_count() ) {
- $count_users = false;
- } elseif ( is_multisite() && wp_is_large_network( 'users' ) ) {
- $count_users = false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_users ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'site-users.php?id=' . $this->site_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users ) {
- switch_to_blog( $this->site_id );
- $users_of_blog = count_users( 'time', $this->site_id );
- restore_current_blog();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_to_blog( $this->site_id );
+ $users_of_blog = count_users( 'time', $this->site_id );
+ restore_current_blog();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'users.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users ) {
- $users_of_blog = count_users();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users_of_blog = count_users();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users ) {
- $total_users = $users_of_blog['total_users'];
- $avail_roles =& $users_of_blog['avail_roles'];
- unset($users_of_blog);
- } else {
- $avail_roles = array();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $total_users = $users_of_blog['total_users'];
+ $avail_roles =& $users_of_blog['avail_roles'];
+ unset($users_of_blog);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( $count_users ) {
- $role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
- } else {
- $role_links['all'] = "<a href='$url'$current_link_attributes>" . _x( 'All', 'users' ) . '</a>';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_roles->get_names() as $this_role => $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users && !isset($avail_roles[$this_role]) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !isset($avail_roles[$this_role]) )
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,14 +196,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = translate_user_role( $name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users ) {
- /* translators: User role name with count */
- $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User role name with count */
+ $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $count_users || ! empty( $avail_roles['none' ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $avail_roles['none' ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,10 +210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = __( 'No role' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count_users ) {
- /* translators: User role name with count */
- $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User role name with count */
+ $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2017-10-04 21:00:15 UTC (rev 41752)
+++ trunk/src/wp-includes/default-filters.php 2017-10-04 22:16:21 UTC (rev 41753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,11 +466,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Widgets
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wp_widgets_init', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// User counts
-foreach ( array( 'user_register', 'deleted_user' ) as $action ){
- add_action( $action, 'wp_update_active_user_count' );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Admin Bar
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't remove. Wrong way to disable.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2017-10-04 21:00:15 UTC (rev 41752)
+++ trunk/src/wp-includes/functions.php 2017-10-04 22:16:21 UTC (rev 41753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5837,64 +5837,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_name
</span><span class="cx" style="display: block; padding: 0 10px"> ), $email_change_email['message'], $email_change_email['headers'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/**
- * Whether or not we have a large site, based on its number of users.
- *
- * The default criteria for a large site is more than 10,000 users.
- *
- * @since 4.9.0
- *
- * @return bool True if the site meets the criteria for large. False otherwise.
- */
-function wp_is_large_user_count() {
- $count = wp_get_active_user_count();
-
- /**
- * Filters whether the site is considered large, based on its number of users.
- *
- * The default criteria for a large site is more than 10,000 users.
- *
- * @since 4.9.0
- *
- * @param bool $is_large_user_count Whether the site is considered large.
- * @param int $count The number of users on the site.
- */
- return apply_filters( 'wp_is_large_user_count', $count > 10000, $count );
-}
-
-/**
- * Update the active user count.
- *
- * @since 4.9.0
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @return int The active user count.
- */
-function wp_update_active_user_count() {
- global $wpdb;
-
- $count = $wpdb->get_var( "
- SELECT COUNT(ID) as c
- FROM {$wpdb->users}
- " );
- update_option( 'active_user_count', $count );
-
- return (int) $count;
-}
-
-/**
- * The number of active users.
- *
- * @since 4.9.0
- *
- * @return int The active user count.
- */
-function wp_get_active_user_count() {
- $count = get_option( 'active_user_count', false );
-
- if ( false === $count ) {
- $count = wp_update_active_user_count();
- }
- return (int) $count;
-}
</del></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2017-10-04 21:00:15 UTC (rev 41752)
+++ trunk/src/wp-includes/ms-functions.php 2017-10-04 22:16:21 UTC (rev 41753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2529,11 +2529,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'users' == $using ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $count = get_user_count( $network_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_large = ( $count > 10000 );
-
- /** This filter is documented in wp-includes/functions.php */
- $is_large = apply_filters( 'wp_is_large_user_count', $is_large, $count );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the network is considered large.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2545,7 +2540,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $count The count of items for the component.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id The ID of the network being checked.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'wp_is_large_network', $is_large, 'users', $count, $network_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count, $network_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = get_blog_count( $network_id );
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2017-10-04 21:00:15 UTC (rev 41752)
+++ trunk/src/wp-includes/update.php 2017-10-04 22:16:21 UTC (rev 41753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_install = network_site_url();
</span><span class="cx" style="display: block; padding: 0 10px"> $multisite_enabled = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_count = wp_get_active_user_count();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_count = count_users();
+ $user_count = $user_count['total_users'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $multisite_enabled = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $num_blogs = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_install = home_url( '/' );
</span></span></pre>
</div>
</div>
</body>
</html>