From 1c87155b6dcf03dc11aedecd5760b921191e3c66 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 27 Feb 2010 17:48:37 +0000
Subject: [PATCH] warnings cleanup on archived/suspended sites, fixes #12396

git-svn-id: http://svn.automattic.com/wordpress/trunk@13461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php         | 1 +
 wp-includes/general-template.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 48bb1dafa1..4ac2cb6716 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -48,6 +48,7 @@ add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
 function wpmu_delete_blog($blog_id, $drop = false) {
 	global $wpdb;
 
+	$switched = false;
 	if ( $blog_id != $wpdb->blogid ) {
 		$switch = true;
 		switch_to_blog($blog_id);
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index fe80c9f0dd..e8b765a494 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -453,7 +453,10 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 			break;
 		case 'text_direction':
 			global $wp_locale;
-			$output = $wp_locale->text_direction;
+			if ( isset( $wp_locale ) )
+				$output = $wp_locale->text_direction;
+			else
+				$output = 'ltr';
 			break;
 		case 'name':
 		default: