← All changes | classes/autoptimizeVersionUpdatesHandler.php +81 -16 2.4.3 → 3.0.3 View file →

		@@ -46,13 +46,25 @@
46	46	$this->upgrade_from_2_2();
47	47	$major_update = true;
48	48	// No break, intentionally, so all upgrades are ran during a single request...
49	49	case '2.4':
50		- if ( get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) {
	50	+ if ( autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) {
51	51	$this->upgrade_from_2_4_2();
52	52	}
	53	+ $this->upgrade_from_2_4();
53	54	$major_update = false;
54	55	// No break, intentionally, so all upgrades are ran during a single request...
	56	+ case '2.7':
	57	+ $this->upgrade_from_2_7();
	58	+ $major_update = true;
	59	+ // No break, intentionally, so all upgrades are ran during a single request...
	60	+ case '2.8':
	61	+ // nothing
	62	+ case '2.9':
	63	+ if ( version_compare( autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ), '2.9.999', 'lt' ) ) {
	64	+ $this->upgrade_from_2_9_before_compatibility();
	65	+ }
	66	+ $major_update = false;
55	67	}
56	68
57	69	if ( true === $major_update ) {
58	70	$this->on_major_version_update();
		@@ -67,9 +79,9 @@
67	79	* @param string $target Target version to check against (ie., the currently running one).
68	80	*/
69	81	public static function check_installed_and_update( $target )
70	82	{
71		- $db_version = get_option( 'autoptimize_version', 'none' );
	83	+ $db_version = autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' );
72	84	if ( $db_version !== $target ) {
73	85	if ( 'none' === $db_version ) {
74	86	add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
75	87	} else {
		@@ -77,9 +89,9 @@
77	89	$updater->run_needed_major_upgrades();
78	90	}
79	91
80	92	// Versions differed, upgrades happened if needed, store the new version.
81		- update_option( 'autoptimize_version', $target );
	93	+ autoptimizeOptionWrapper::update_option( 'autoptimize_version', $target );
82	94	}
83	95	}
84	96
85	97	/**
		@@ -101,9 +113,9 @@
101	113	*/
102	114	private function upgrade_from_1_6()
103	115	{
104	116	// If user was on version 1.6.x, force advanced options to be shown by default.
105		- update_option( 'autoptimize_show_adv', '1' );
	117	+ autoptimizeOptionWrapper::update_option( 'autoptimize_show_adv', '1' );
106	118
107	119	// And remove old options.
108	120	$to_delete_options = array(
109	121	'autoptimize_cdn_css',
		@@ -126,15 +138,15 @@
126	138	*/
127	139	private function upgrade_from_1_7()
128	140	{
129	141	if ( ! is_multisite() ) {
130		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	142	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
131	143	if ( empty( $css_exclude ) ) {
132	144	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
133	145	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
134	146	$css_exclude .= ', dashicons.min.css';
135	147	}
136		- update_option( 'autoptimize_css_exclude', $css_exclude );
	148	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
137	149	} else {
138	150	global $wpdb;
139	151	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
140	152	$original_blog_id = get_current_blog_id();
		@@ -139,15 +151,15 @@
139	151	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
140	152	$original_blog_id = get_current_blog_id();
141	153	foreach ( $blog_ids as $blog_id ) {
142	154	switch_to_blog( $blog_id );
143		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	155	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
144	156	if ( empty( $css_exclude ) ) {
145	157	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
146	158	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
147	159	$css_exclude .= ', dashicons.min.css';
148	160	}
149		- update_option( 'autoptimize_css_exclude', $css_exclude );
	161	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
150	162	}
151	163	switch_to_blog( $original_blog_id );
152	164	}
153	165	}
		@@ -160,10 +172,10 @@
160	172	*/
161	173	private function upgrade_from_1_9()
162	174	{
163	175	if ( ! is_multisite() ) {
164		- update_option( 'autoptimize_css_include_inline', 'on' );
165		- update_option( 'autoptimize_js_include_inline', 'on' );
	176	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
	177	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
166	178	} else {
167	179	global $wpdb;
168	180	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
169	181	$original_blog_id = get_current_blog_id();
		@@ -168,10 +180,10 @@
168	180	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
169	181	$original_blog_id = get_current_blog_id();
170	182	foreach ( $blog_ids as $blog_id ) {
171	183	switch_to_blog( $blog_id );
172		- update_option( 'autoptimize_css_include_inline', 'on' );
173		- update_option( 'autoptimize_js_include_inline', 'on' );
	184	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
	185	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
174	186	}
175	187	switch_to_blog( $original_blog_id );
176	188	}
177	189	}
		@@ -201,12 +213,12 @@
201	213	* Helper for 2.2 autoptimize_extra_settings upgrade to avoid duplicate code
202	214	*/
203	215	private function do_2_2_settings_update()
204	216	{
205		- $nogooglefont = get_option( 'autoptimize_css_nogooglefont', '' );
206		- $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
	217	+ $nogooglefont = autoptimizeOptionWrapper::get_option( 'autoptimize_css_nogooglefont', '' );
	218	+ $ao_extrasetting = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
207	219	if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
208		- update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
	220	+ autoptimizeOptionWrapper::update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
209	221	}
210	222	delete_option( 'autoptimize_css_nogooglefont' );
211	223	}
212	224
		@@ -213,7 +225,60 @@
213	225	/**
214	226	* 2.4.2 introduced too many cronned ao_cachecheckers, make this right
215	227	*/
216	228	private function upgrade_from_2_4_2() {
217		- wp_clear_scheduled_hook( 'ao_cachechecker' );
	229	+ // below code by Thomas Sjolshagen (http://eighty20results.com/)
	230	+ // as found on https://www.paidmembershipspro.com/deleting-oldextra-cron-events/.
	231	+ $jobs = _get_cron_array();
	232	+
	233	+ // Remove all ao_cachechecker cron jobs (for now).
	234	+ foreach ( $jobs as $when => $job ) {
	235	+ $name = key( $job );
	236	+
	237	+ if ( false !== strpos( $name, 'ao_cachechecker' ) ) {
	238	+ unset( $jobs[ $when ] );
	239	+ }
	240	+ }
	241	+
	242	+ // Save the data.
	243	+ _set_cron_array( $jobs );
	244	+ }
	245	+
	246	+ /**
	247	+ * Migrate imgopt options from autoptimize_extra_settings to autoptimize_imgopt_settings
	248	+ */
	249	+ private function upgrade_from_2_4() {
	250	+ $extra_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
	251	+ $imgopt_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings', '' );
	252	+ if ( empty( $imgopt_settings ) && ! empty( $extra_settings ) ) {
	253	+ $imgopt_settings = autoptimizeConfig::get_ao_imgopt_default_options();
	254	+ if ( array_key_exists( 'autoptimize_extra_checkbox_field_5', $extra_settings ) ) {
	255	+ $imgopt_settings['autoptimize_imgopt_checkbox_field_1'] = $extra_settings['autoptimize_extra_checkbox_field_5'];
	256	+ }
	257	+ if ( array_key_exists( 'autoptimize_extra_select_field_6', $extra_settings ) ) {
	258	+ $imgopt_settings['autoptimize_imgopt_select_field_2'] = $extra_settings['autoptimize_extra_select_field_6'];
	259	+ }
	260	+ autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_settings', $imgopt_settings );
	261	+ }
	262	+ }
	263	+
	264	+ /**
	265	+ * remove CCSS request limit option + update jquery exclusion to include WordPress 5.6 jquery.min.js.
	266	+ */
	267	+ private function upgrade_from_2_7() {
	268	+ delete_option( 'autoptimize_ccss_rlimit' );
	269	+ $js_exclusions = get_option( 'autoptimize_js_exclude', '' );
	270	+ if ( strpos( $js_exclusions, 'js/jquery/jquery.js' ) !== false && strpos( $js_exclusions, 'js/jquery/jquery.min.js' ) === false ) {
	271	+ $js_exclusions .= ', js/jquery/jquery.min.js';
	272	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_exclude', $js_exclusions );
	273	+ }
	274	+ }
	275	+
	276	+ /**
	277	+ * set an option to indicate the AO installation predates the compatibility logic, this way we
	278	+ * can avoid adding compatibility code that is likely not needed and maybe not wanted as it
	279	+ * can introduce performance regressions.
	280	+ */
	281	+ private function upgrade_from_2_9_before_compatibility() {
	282	+ autoptimizeOptionWrapper::update_option( 'autoptimize_installed_before_compatibility', true );
218	283	}
219	284	}