From 12800b27faf69371a4b441158c8488502be3bf2f Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 13 Feb 2010 19:57:43 +0000
Subject: [PATCH] Add is_multisite() check to wpdb::get_blog_prefix() to fix
 get_blog_prefix($blog_id) call on a non-MS install. See #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@13121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/wp-db.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 4b6506987..d6e844d9d 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -489,12 +489,11 @@ class wpdb {
 	}
 
 	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;
 		}