Changes in trunk/wp-includes/ms-functions.php [15186:14928]

File:

• trunk/wp-includes/ms-functions.php (modified) (5 diffs)

trunk/wp-includes/ms-functions.php

@@ -159 +159 @@
 }
 
+function get_most_active_blogs( $num = 10, $display = true ) {
+    $most_active = get_site_option( 'most_active' );
+    $update = false;
+    if ( is_array( $most_active ) ) {
+        if ( ( $most_active['time'] + 60 ) < time() ) { // cache for 60 seconds.
+            $update = true;
+        }
+    } else {
+        $update = true;
+    }
+
+    if ( $update == true ) {
+        unset( $most_active );
+        $blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
+        if ( is_array( $blogs ) ) {
+            reset( $blogs );
+            foreach ( (array) $blogs as $key => $details ) {
+                $most_active[ $details['blog_id'] ] = $details['postcount'];
+                $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
+            }
+            arsort( $most_active );
+            reset( $most_active );
+            foreach ( (array) $most_active as $key => $details )
+                $t[ $key ] = $blog_list[ $key ];
+
+            unset( $most_active );
+            $most_active = $t;
+        }
+        update_site_option( 'most_active', $most_active );
+    }
+
+    if ( $display == true ) {
+        if ( is_array( $most_active ) ) {
+            reset( $most_active );
+            foreach ( (array) $most_active as $key => $details ) {
+                $url = esc_url('http://' . $details['domain'] . $details['path']);
+                echo '<li>' . $details['postcount'] . " <a href='$url'>$url</a></li>";
+            }
+        }
+    }
+    return array_slice( $most_active, 0, $num );
+}
+
 function get_user_count() {
     global $wpdb;
@@ -555 +598 @@
     // Check if the domain/path has been used already.
     if ( is_subdomain_install() ) {
-        $mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
+        $mydomain = "$blogname.$domain";
         $path = $base;
     } else {
@@ -689 +732 @@
     $user_login = $wpdb->escape($signup->user_login);
     $user_email = $wpdb->escape($signup->user_email);
+    wpmu_validate_user_signup($user_login, $user_email);
     $password = wp_generate_password();
 
@@ -722 +766 @@
     }
 
+    wpmu_validate_blog_signup($signup->domain, $signup->title);
     $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
 
@@ -1194 +1239 @@
             $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
             $global_id = $wpdb->insert_id;
-            if ( empty( $global_id ) )
-                return $term_id;
         } else {
             $max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );