warnings cleanup, dont show removed user in edit site, fixes #12409
git-svn-id: https://develop.svn.wordpress.org/trunk@13460 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
5c8e788197
commit
60a2d570c0
|
@ -242,6 +242,8 @@ switch ( $action ) {
|
||||||
echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
|
echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
|
||||||
reset($blogusers);
|
reset($blogusers);
|
||||||
foreach ( (array) $blogusers as $key => $val ) {
|
foreach ( (array) $blogusers as $key => $val ) {
|
||||||
|
if ( isset( $val->meta_value ) && ! $val->meta_value )
|
||||||
|
continue;
|
||||||
$t = @unserialize( $val->meta_value );
|
$t = @unserialize( $val->meta_value );
|
||||||
if ( is_array( $t ) ) {
|
if ( is_array( $t ) ) {
|
||||||
reset( $t );
|
reset( $t );
|
||||||
|
|
|
@ -280,12 +280,15 @@ function get_blog_option( $blog_id, $setting, $default = false ) {
|
||||||
if ( $blog_id == $wpdb->blogid ) {
|
if ( $blog_id == $wpdb->blogid ) {
|
||||||
$value = get_option( $setting, $default );
|
$value = get_option( $setting, $default );
|
||||||
$notoptions = wp_cache_get( 'notoptions', 'options' );
|
$notoptions = wp_cache_get( 'notoptions', 'options' );
|
||||||
if ( isset( $notoptions[$setting] ) )
|
if ( isset( $notoptions[$setting] ) ) {
|
||||||
wp_cache_set( $key, 'noop', 'site-options' );
|
wp_cache_set( $key, 'noop', 'site-options' );
|
||||||
elseif ( $value == false )
|
$value = $default;
|
||||||
|
} elseif ( $value == false ) {
|
||||||
wp_cache_set( $key, 'falsevalue', 'site-options' );
|
wp_cache_set( $key, 'falsevalue', 'site-options' );
|
||||||
else
|
} else {
|
||||||
wp_cache_set( $key, $value, 'site-options' );
|
wp_cache_set( $key, $value, 'site-options' );
|
||||||
|
}
|
||||||
|
return apply_filters( 'blog_option_' . $setting, $value, $blog_id );
|
||||||
} else {
|
} else {
|
||||||
$blog_prefix = $wpdb->get_blog_prefix( $blog_id );
|
$blog_prefix = $wpdb->get_blog_prefix( $blog_id );
|
||||||
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
|
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
|
||||||
|
|
Loading…
Reference in New Issue