Ticket #21270: 21270.5.diff

wp-includes/ms-blogs.php

@@ -329 +329 @@
         if ( empty( $id ) )
                 $id = get_current_blog_id();
 
-        if ( $id == get_current_blog_id() )
+        if ( get_current_blog_id() == $id )
                 return get_option( $option, $default );
 
         switch_to_blog( $id );
@@ -364 +364 @@
         if ( empty( $id ) )
                 $id = get_current_blog_id();
 
-        if ( $id == get_current_blog_id() )
+        if ( get_current_blog_id() == $id )
                 return add_option( $option, $value );
 
         switch_to_blog( $id );
@@ -389 +389 @@
         if ( empty( $id ) )
                 $id = get_current_blog_id();
 
-        if ( $id == get_current_blog_id() )
+        if ( get_current_blog_id() == $id )
                 return delete_option( $option );
 
         switch_to_blog( $id );
@@ -415 +415 @@
         if ( null !== $deprecated  )
                 _deprecated_argument( __FUNCTION__, '3.1' );
 
-        if ( $id == get_current_blog_id() )
+        if ( get_current_blog_id() == $id )
                 return update_option( $option, $value );
 
         switch_to_blog( $id );