Use Yoda conditions. Props evansolomon. see #21270
git-svn-id: http://core.svn.wordpress.org/trunk@21378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
fed9492cbc
commit
af18fc1ae2
|
@ -329,7 +329,7 @@ function get_blog_option( $id, $option, $default = false ) {
|
||||||
if ( empty( $id ) )
|
if ( empty( $id ) )
|
||||||
$id = get_current_blog_id();
|
$id = get_current_blog_id();
|
||||||
|
|
||||||
if ( $id == get_current_blog_id() )
|
if ( get_current_blog_id() == $id )
|
||||||
return get_option( $option, $default );
|
return get_option( $option, $default );
|
||||||
|
|
||||||
switch_to_blog( $id );
|
switch_to_blog( $id );
|
||||||
|
@ -364,7 +364,7 @@ function add_blog_option( $id, $option, $value ) {
|
||||||
if ( empty( $id ) )
|
if ( empty( $id ) )
|
||||||
$id = get_current_blog_id();
|
$id = get_current_blog_id();
|
||||||
|
|
||||||
if ( $id == get_current_blog_id() )
|
if ( get_current_blog_id() == $id )
|
||||||
return add_option( $option, $value );
|
return add_option( $option, $value );
|
||||||
|
|
||||||
switch_to_blog( $id );
|
switch_to_blog( $id );
|
||||||
|
@ -389,7 +389,7 @@ function delete_blog_option( $id, $option ) {
|
||||||
if ( empty( $id ) )
|
if ( empty( $id ) )
|
||||||
$id = get_current_blog_id();
|
$id = get_current_blog_id();
|
||||||
|
|
||||||
if ( $id == get_current_blog_id() )
|
if ( get_current_blog_id() == $id )
|
||||||
return delete_option( $option );
|
return delete_option( $option );
|
||||||
|
|
||||||
switch_to_blog( $id );
|
switch_to_blog( $id );
|
||||||
|
@ -415,7 +415,7 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
|
||||||
if ( null !== $deprecated )
|
if ( null !== $deprecated )
|
||||||
_deprecated_argument( __FUNCTION__, '3.1' );
|
_deprecated_argument( __FUNCTION__, '3.1' );
|
||||||
|
|
||||||
if ( $id == get_current_blog_id() )
|
if ( get_current_blog_id() == $id )
|
||||||
return update_option( $option, $value );
|
return update_option( $option, $value );
|
||||||
|
|
||||||
switch_to_blog( $id );
|
switch_to_blog( $id );
|
||||||
|
|
Loading…
Reference in New Issue