diff options
Diffstat (limited to 'plugins/jetpack/sync/class.jetpack-sync-module-options.php')
| -rw-r--r-- | plugins/jetpack/sync/class.jetpack-sync-module-options.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/plugins/jetpack/sync/class.jetpack-sync-module-options.php b/plugins/jetpack/sync/class.jetpack-sync-module-options.php index 37cb4579..287e73b9 100644 --- a/plugins/jetpack/sync/class.jetpack-sync-module-options.php +++ b/plugins/jetpack/sync/class.jetpack-sync-module-options.php @@ -71,7 +71,7 @@ class Jetpack_Sync_Module_Options extends Jetpack_Sync_Module { // Is public so that we don't have to store so much data all the options twice. function get_all_options() { - $options = array(); + $options = array(); $random_string = wp_generate_password(); foreach ( $this->options_whitelist as $option ) { $option_value = get_option( $option, $random_string ); @@ -81,7 +81,7 @@ class Jetpack_Sync_Module_Options extends Jetpack_Sync_Module { } // add theme mods - $theme_mods_option = 'theme_mods_'.get_option( 'stylesheet' ); + $theme_mods_option = 'theme_mods_' . get_option( 'stylesheet' ); $theme_mods_value = get_option( $theme_mods_option, $random_string ); if ( $theme_mods_value === $random_string ) { return $options; @@ -128,7 +128,7 @@ class Jetpack_Sync_Module_Options extends Jetpack_Sync_Module { // Set value(s) of contentless option to empty string(s) if ( $this->is_contentless_option( $args[0] ) ) { // Create a new array matching length of $args, containing empty strings - $empty = array_fill( 0, count( $args ), '' ); + $empty = array_fill( 0, count( $args ), '' ); $empty[0] = $args[0]; return $empty; } @@ -151,18 +151,14 @@ class Jetpack_Sync_Module_Options extends Jetpack_Sync_Module { } function jetpack_sync_core_icon() { - if ( function_exists( 'get_site_icon_url' ) ) { - $url = get_site_icon_url(); - } else { - return; - } + $url = get_site_icon_url(); - require_once( JETPACK__PLUGIN_DIR . 'modules/site-icon/site-icon-functions.php' ); + require_once JETPACK__PLUGIN_DIR . 'modules/site-icon/site-icon-functions.php'; // If there's a core icon, maybe update the option. If not, fall back to Jetpack's. if ( ! empty( $url ) && $url !== jetpack_site_icon_url() ) { // This is the option that is synced with dotcom Jetpack_Options::update_option( 'site_icon_url', $url ); - } else if ( empty( $url ) ) { + } elseif ( empty( $url ) ) { Jetpack_Options::delete_option( 'site_icon_url' ); } } |