Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-11 14:22:26 +01:00
Code Issues Projects Releases Wiki Activity

warnings cleanup, dont show removed user in edit site, fixes #12409

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

2
wp-admin/ms-sites.php
View File

@ -242,6 +242,8 @@ switch ( $action ) {
echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
reset($blogusers);
foreach ( (array) $blogusers as $key => $val ) {
if ( isset( $val->meta_value ) && ! $val->meta_value )
continue;
$t = @unserialize( $val->meta_value );
if ( is_array( $t ) ) {
reset( $t );

11
wp-includes/ms-blogs.php
View File

@ -280,12 +280,15 @@ function get_blog_option( $blog_id, $setting, $default = false ) {
if ( $blog_id == $wpdb->blogid ) {
$value = get_option( $setting, $default );
$notoptions = wp_cache_get( 'notoptions', 'options' );
if ( isset( $notoptions[$setting] ) )
if ( isset( $notoptions[$setting] ) ) {
wp_cache_set( $key, 'noop', 'site-options' );
elseif ( $value == false )
$value = $default;
} elseif ( $value == false ) {
wp_cache_set( $key, 'falsevalue', 'site-options' );
else
} else {
wp_cache_set( $key, $value, 'site-options' );
}
return apply_filters( 'blog_option_' . $setting, $value, $blog_id );
} else {
$blog_prefix = $wpdb->get_blog_prefix( $blog_id );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
@ -552,4 +555,4 @@ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
return array_slice( $blogs, $start, $num );
}
?>
?>