WordPress 4.2

[autoinstalls/wordpress.git] / wp-includes / ms-blogs.php

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index e1c70e1a8d20467f7858896dd7d6f4603ab53ebe..74885b135064a114f47c7ca2d14c929c38026c4f 100644 (file)
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -33,11 +33,11 @@ function wpmu_update_blogs_date() {
  * @since MU
  *
  * @param int $blog_id Blog ID
- * @return string
+ * @return string Full URL of the blog if found. Empty string if not.
  */
 function get_blogaddress_by_id( $blog_id ) {
        $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
-       return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
+       return ( $bloginfo ) ? esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ) : '';
 }
 
 /**
@@ -99,7 +99,7 @@ function get_id_from_blogname( $slug ) {
  *
  * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against. Optional. If not specified the current blog ID is used.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
- * @return object Blog details.
+ * @return object|false Blog details on success. False on failure.
  */
 function get_blog_details( $fields = null, $get_all = true ) {
        global $wpdb;
@@ -296,8 +296,13 @@ function update_blog_details( $blog_id, $details = array() ) {
 
        $update_details = array();
        $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-       foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
-               $update_details[$field] = $details[$field];
+       foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
+               if ( 'path' === $field ) {
+                       $details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
+               }
+
+               $update_details[ $field ] = $details[ $field ];
+       }
 
        $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
 
@@ -620,10 +625,11 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
                wp_cache_init();
 
                if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-                       if ( is_array( $global_groups ) )
+                       if ( is_array( $global_groups ) ) {
                                wp_cache_add_global_groups( $global_groups );
-                       else
-                               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
+                       } else {
+                               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+                       }
                        wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
                }
        }
@@ -683,10 +689,11 @@ function restore_current_blog() {
                wp_cache_init();
 
                if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-                       if ( is_array( $global_groups ) )
+                       if ( is_array( $global_groups ) ) {
                                wp_cache_add_global_groups( $global_groups );
-                       else
-                               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
+                       } else {
+                               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+                       }
                        wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
                }
        }