WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

warnings cleanup on archived/suspended sites, fixes #12396 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-27 17:48:37 +00:00
parent 21f661bdf0
commit 1c87155b6d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/ms.php
View File

@ -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);

5
wp-includes/general-template.php
View File

@ -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: