<!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>[18871] trunk/wp-admin/includes: Consolidate larg network criteria into wp_is_large_network().</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18871">18871</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-03 16:30:07 +0000 (Mon, 03 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate larg network criteria into wp_is_large_network(). Allow plugins to change this criteria via filter. Props PeteMall. fixes <a href="http://core.trac.wordpress.org/ticket/18464">#18464</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (18870 => 18871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-10-03 16:22:38 UTC (rev 18870)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-10-03 16:30:07 UTC (rev 18871)
</span><span class="lines">@@ -37,15 +37,13 @@
</span><span class="cx">
</span><span class="cx"> $like_s = esc_sql( like_escape( $s ) );
</span><span class="cx">
</span><del>- $large_network = false;
</del><span class="cx"> // If the network is large and a search is not being performed, show only the latest blogs with no paging in order
</span><span class="cx"> // to avoid expensive count queries.
</span><del>- if ( !$s && ( get_blog_count() >= 10000 ) ) {
</del><ins>+ if ( !$s && wp_is_large_network() ) {
</ins><span class="cx"> if ( !isset($_REQUEST['orderby']) )
</span><span class="cx"> $_GET['orderby'] = $_REQUEST['orderby'] = '';
</span><span class="cx"> if ( !isset($_REQUEST['order']) )
</span><span class="cx"> $_GET['order'] = $_REQUEST['order'] = 'DESC';
</span><del>- $large_network = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
</span><span class="lines">@@ -104,13 +102,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Don't do an unbounded count on large networks
</span><del>- if ( ! $large_network )
</del><ins>+ if ( ! wp_is_large_network() )
</ins><span class="cx"> $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
</span><span class="cx">
</span><span class="cx"> $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
</span><span class="cx"> $this->items = $wpdb->get_results( $query, ARRAY_A );
</span><span class="cx">
</span><del>- if ( $large_network )
</del><ins>+ if ( wp_is_large_network() )
</ins><span class="cx"> $total = count($this->items);
</span><span class="cx">
</span><span class="cx"> $this->set_pagination_args( array(
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (18870 => 18871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-10-03 16:22:38 UTC (rev 18870)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-10-03 16:30:07 UTC (rev 18871)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> 'fields' => 'all_with_meta'
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $args['search'] = ltrim($args['search'], '*');
</del><ins>+ if ( wp_is_large_network( 'users' ) )
+ $args['search'] = ltrim( $args['search'], '*' );
</ins><span class="cx">
</span><span class="cx"> if ( $role == 'super' ) {
</span><span class="cx"> $logins = implode( "', '", get_super_admins() );
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> // If the network is large and a search is not being performed, show only the latest users with no paging in order
</span><span class="cx"> // to avoid expensive count queries.
</span><del>- if ( !$usersearch && ( get_blog_count() >= 10000 ) ) {
</del><ins>+ if ( !$usersearch && wp_is_large_network( 'users' ) ) {
</ins><span class="cx"> if ( !isset($_REQUEST['orderby']) )
</span><span class="cx"> $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
</span><span class="cx"> if ( !isset($_REQUEST['order']) )
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (18870 => 18871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-10-03 16:22:38 UTC (rev 18870)
+++ trunk/wp-admin/includes/ms.php 2011-10-03 16:30:07 UTC (rev 18871)
</span><span class="lines">@@ -775,4 +775,23 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Whether or not we have a large network.
+ *
+ * The default criteria for a large network is either more than 10,000 users or more than 10,000 sites.
+ * Plugins can alter this criteria using the 'wp_is_large_network' filter.
+ *
+ * @since 3.3.0
+ * @param string $using 'sites or 'users'. Default is 'sites'.
+ * @return bool True if the network meets the criteria for large. False otherwise.
+ */
+function wp_is_large_network( $using = 'sites' ) {
+ if ( 'users' == $using ) {
+ $count = get_user_count();
+ return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count );
+ }
+
+ $count = get_blog_count();
+ return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count );
+}
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>