Changeset 22092 for trunk/wp-includes/ms-functions.php

Timestamp:

10/01/2012 06:03:23 PM (12 years ago)

Author:

ryan

Message:

• Register blog-id-cache group as global
• Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
• Don't db escape cache keys in get_blog_id_from_url()
• prepare() the query in get_blog_id_from_url()
• Return 0 for all failures in get_blog_id_from_url()
• clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -333 +333 @@
  * @param string $domain
  * @param string $path Optional. Not required for subdomain installations.
- * @return int
+ * @return int 0 if no blog found, otherwise the ID of the matching blog
  */
 function get_blog_id_from_url( $domain, $path = '/' ) {
     global $wpdb;
 
-    $domain = strtolower( $wpdb->escape( $domain ) );
-    $path = strtolower( $wpdb->escape( $path ) );
+    $domain = strtolower( $domain );
+    $path = strtolower( $path );
     $id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-    if ( $id == -1 ) { // blog does not exist
+    if ( $id == -1 ) // blog does not exist
         return 0;
-    } elseif ( $id ) {
-        return (int)$id;
-    }
-
-    $id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs WHERE domain = '$domain' and path = '$path' /* get_blog_id_from_url */" );
-
-    if ( !$id ) {
+    elseif ( $id )
+        return (int) $id;
+
+    $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+
+    if ( ! $id ) {
         wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
-        return false;
-    }
+        return 0;
+    }
+
     wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );