Changeset 13460

Timestamp:

02/27/2010 05:27:34 PM (16 years ago)

Author:

wpmuguru

Message:

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

Location:

trunk

Files:

• wp-admin/ms-sites.php (modified) (1 diff)
• wp-includes/ms-blogs.php (modified) (1 diff)

trunk/wp-admin/ms-sites.php

@@ -243 +243 @@
                         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 ) ) {

trunk/wp-includes/ms-blogs.php

@@ -281 +281 @@
             $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 );