Changeset 21979 for trunk/wp-includes/ms-blogs.php

Timestamp:

09/24/2012 07:31:37 PM (12 years ago)

Author:

ryan

Message:

• Invalidate the get_id_from_blogname_* cache in refresh_blog_details()
• Change $name to $slug in get_id_from_blogname() for some semblance of clarity.
• Strip leading and trailing slashes from the slug in get_id_from_blogname() so get_blog_details()->path can be passed directly.

Props wonderboymusic
see #20950

File:

• trunk/wp-includes/ms-blogs.php (modified) (3 diffs)

trunk/wp-includes/ms-blogs.php

@@ -85 +85 @@
 
 /**
- * Given a blog's (subdomain or directory) name, retrieve it's id.
- *
- * @since MU
- *
- * @param string $name
+ * Given a blog's (subdomain or directory) slug, retrieve it's id.
+ *
+ * @since MU
+ *
+ * @param string $slug
  * @return int A blog id
  */
-function get_id_from_blogname( $name ) {
+function get_id_from_blogname( $slug ) {
     global $wpdb, $current_site;
-    $blog_id = wp_cache_get( 'get_id_from_blogname_' . $name, 'blog-details' );
+
+    $slug = trim( $slug, '/' );
+
+    $blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
     if ( $blog_id )
         return $blog_id;
 
     if ( is_subdomain_install() ) {
-        $domain = $name . '.' . $current_site->domain;
+        $domain = $slug . '.' . $current_site->domain;
         $path = $current_site->path;
     } else {
         $domain = $current_site->domain;
-        $path = $current_site->path . $name . '/';
-    }
+        $path = $current_site->path . $slug . '/';
+    }
+
     $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
-    wp_cache_set( 'get_id_from_blogname_' . $name, $blog_id, 'blog-details' );
+    wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
     return $blog_id;
 }
@@ -115 +119 @@
  * @since MU
  *
- * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
+ * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
  * @return object Blog details.
@@ -255 +259 @@
     wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
     wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
+    wp_cache_delete( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' );
 
     do_action( 'refresh_blog_details', $blog_id );