sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

warnings cleanup on archived/suspended sites, fixes #12396

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13461 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick 2010-02-27 17:48:37 +00:00
parent 60a2d570c0
commit 97da99aa6a
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: