| @@ -2,10 +2,8 @@ | ||
| 2 | 2 | /* |
| 3 | 3 | * below code handles updates and is only included by autoptimize.php if/ when needed |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly | |
| 7 | - | |
| 8 | 6 | $majorUp = false; |
| 9 | 7 | $autoptimize_major_version=substr($autoptimize_db_version,0,3); |
| 10 | 8 | |
| 11 | 9 | switch($autoptimize_major_version) { |
| @@ -66,41 +64,11 @@ | ||
| 66 | 64 | } |
| 67 | 65 | switch_to_blog( $original_blog_id ); |
| 68 | 66 | } |
| 69 | 67 | $majorUp = true; |
| 70 | - case "2.2": | |
| 71 | - /* | |
| 72 | - * 2.3 has no "remove google fonts" in main screen, moved to "extra" | |
| 73 | - */ | |
| 74 | - if ( !is_multisite() ) { | |
| 75 | - $_nogooglefont = get_option('autoptimize_css_nogooglefont',''); | |
| 76 | - $_ao_extrasetting = get_option('autoptimize_extra_settings',''); | |
| 77 | - if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) { | |
| 78 | - $_aoextra_removegfonts = array("autoptimize_extra_checkbox_field_1"=>"0","autoptimize_extra_checkbox_field_0"=>"0","autoptimize_extra_radio_field_4"=>"1","autoptimize_extra_text_field_2"=>"","autoptimize_extra_text_field_3"=>""); | |
| 79 | - update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts ); | |
| 80 | - } | |
| 81 | - delete_option('autoptimize_css_nogooglefont'); | |
| 82 | - } else { | |
| 83 | - global $wpdb; | |
| 84 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); | |
| 85 | - $original_blog_id = get_current_blog_id(); | |
| 86 | - foreach ( $blog_ids as $blog_id ) { | |
| 87 | - switch_to_blog( $blog_id ); | |
| 88 | - $_nogooglefont = get_option('autoptimize_css_nogooglefont',''); | |
| 89 | - $_ao_extrasetting = get_option('autoptimize_extra_settings',''); | |
| 90 | - if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) { | |
| 91 | - $_aoextra_removegfonts = array("autoptimize_extra_checkbox_field_1"=>"0","autoptimize_extra_checkbox_field_0"=>"0","autoptimize_extra_radio_field_4"=>"1","autoptimize_extra_text_field_2"=>"","autoptimize_extra_text_field_3"=>""); | |
| 92 | - update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts ); | |
| 93 | - } | |
| 94 | - delete_option('autoptimize_css_nogooglefont'); | |
| 95 | - } | |
| 96 | - switch_to_blog( $original_blog_id ); | |
| 97 | - } | |
| 98 | - $majorUp = true; | |
| 99 | 68 | } |
| 100 | 69 | |
| 101 | -if ( $majorUp === true && get_transient('autoptimize_stale_option_buster') == false ) { | |
| 70 | +if ( $majorUp === true ) { | |
| 102 | 71 | // clear cache and notify user to check result if major upgrade |
| 103 | - set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS); | |
| 104 | 72 | autoptimizeCache::clearall(); |
| 105 | 73 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
| 106 | 74 | } |
