Changeset 13121

Timestamp:

02/13/2010 07:57:43 PM (15 years ago)

Author:

nacin

Message:

Add is_multisite() check to wpdb::get_blog_prefix() to fix get_blog_prefix($blog_id) call on a non-MS install. See #11644

File:

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

trunk/wp-includes/wp-db.php

@@ -490 +490 @@
 
     function get_blog_prefix( $blog_id = '' ) {
-        if ( $blog_id ) {
-                        if( defined('MULTISITE') && ( $blog_id == 0 || $blog_id == 1) ) {
-                    return $this->base_prefix;
-                        } else {
-                    return $this->base_prefix . $blog_id . '_';
-                        }
+        if ( is_multisite() && $blog_id ) {
+            if ( defined('MULTISITE') && ( $blog_id == 0 || $blog_id == 1 ) )
+                return $this->base_prefix;
+            else
+                return $this->base_prefix . $blog_id . '_';
         } else {
             return $this->base_prefix;