Changeset 18871

Timestamp:

10/03/2011 04:30:07 PM (13 years ago)

Author:

ryan

Message:

Consolidate larg network criteria into wp_is_large_network(). Allow plugins to change this criteria via filter. Props PeteMall. fixes #18464

Location:

trunk/wp-admin/includes

Files:

• class-wp-ms-sites-list-table.php (modified) (3 diffs)
• class-wp-ms-users-list-table.php (modified) (2 diffs)
• ms.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -38 +38 @@
         $like_s = esc_sql( like_escape( $s ) );
 
-        $large_network = false;
         // If the network is large and a search is not being performed, show only the latest blogs with no paging in order
         // to avoid expensive count queries.
-        if ( !$s && ( get_blog_count() >= 10000 ) ) {
+        if ( !$s && wp_is_large_network() ) {
             if ( !isset($_REQUEST['orderby']) )
                 $_GET['orderby'] = $_REQUEST['orderby'] = '';
             if ( !isset($_REQUEST['order']) )
                 $_GET['order'] = $_REQUEST['order'] = 'DESC';
-            $large_network = true;
         }
 
@@ -105 +103 @@
 
         // Don't do an unbounded count on large networks
-        if ( ! $large_network )
+        if ( ! wp_is_large_network() )
             $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
 
@@ -111 +109 @@
         $this->items = $wpdb->get_results( $query, ARRAY_A );
 
-        if ( $large_network )
+        if ( wp_is_large_network() )
             $total = count($this->items);
 

trunk/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -33 +33 @@
         );
 
-        $args['search'] = ltrim($args['search'], '*');
+        if ( wp_is_large_network( 'users' ) )
+            $args['search'] = ltrim( $args['search'], '*' );
 
         if ( $role == 'super' ) {
@@ -42 +43 @@
         // If the network is large and a search is not being performed, show only the latest users with no paging in order
         // to avoid expensive count queries.
-        if ( !$usersearch && ( get_blog_count() >= 10000 ) ) {
+        if ( !$usersearch && wp_is_large_network( 'users' ) ) {
             if ( !isset($_REQUEST['orderby']) )
                 $_GET['orderby'] = $_REQUEST['orderby'] = 'id';

trunk/wp-admin/includes/ms.php

@@ -776 +776 @@
 }
 
+/**
+ * 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 );
+}
 ?>