← All changes | classes/autoptimizeVersionUpdatesHandler.php +58 -22 2.5.0 → 3.0.3 View file →

		@@ -46,14 +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	53	$this->upgrade_from_2_4();
54	54	$major_update = false;
55	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;
56	67	}
57	68
58	69	if ( true === $major_update ) {
59	70	$this->on_major_version_update();
		@@ -68,9 +79,9 @@
68	79	* @param string $target Target version to check against (ie., the currently running one).
69	80	*/
70	81	public static function check_installed_and_update( $target )
71	82	{
72		- $db_version = get_option( 'autoptimize_version', 'none' );
	83	+ $db_version = autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' );
73	84	if ( $db_version !== $target ) {
74	85	if ( 'none' === $db_version ) {
75	86	add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
76	87	} else {
		@@ -78,9 +89,9 @@
78	89	$updater->run_needed_major_upgrades();
79	90	}
80	91
81	92	// Versions differed, upgrades happened if needed, store the new version.
82		- update_option( 'autoptimize_version', $target );
	93	+ autoptimizeOptionWrapper::update_option( 'autoptimize_version', $target );
83	94	}
84	95	}
85	96
86	97	/**
		@@ -102,9 +113,9 @@
102	113	*/
103	114	private function upgrade_from_1_6()
104	115	{
105	116	// If user was on version 1.6.x, force advanced options to be shown by default.
106		- update_option( 'autoptimize_show_adv', '1' );
	117	+ autoptimizeOptionWrapper::update_option( 'autoptimize_show_adv', '1' );
107	118
108	119	// And remove old options.
109	120	$to_delete_options = array(
110	121	'autoptimize_cdn_css',
		@@ -127,15 +138,15 @@
127	138	*/
128	139	private function upgrade_from_1_7()
129	140	{
130	141	if ( ! is_multisite() ) {
131		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	142	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
132	143	if ( empty( $css_exclude ) ) {
133	144	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
134	145	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
135	146	$css_exclude .= ', dashicons.min.css';
136	147	}
137		- update_option( 'autoptimize_css_exclude', $css_exclude );
	148	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
138	149	} else {
139	150	global $wpdb;
140	151	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
141	152	$original_blog_id = get_current_blog_id();
		@@ -140,15 +151,15 @@
140	151	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
141	152	$original_blog_id = get_current_blog_id();
142	153	foreach ( $blog_ids as $blog_id ) {
143	154	switch_to_blog( $blog_id );
144		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	155	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
145	156	if ( empty( $css_exclude ) ) {
146	157	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
147	158	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
148	159	$css_exclude .= ', dashicons.min.css';
149	160	}
150		- update_option( 'autoptimize_css_exclude', $css_exclude );
	161	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
151	162	}
152	163	switch_to_blog( $original_blog_id );
153	164	}
154	165	}
		@@ -161,10 +172,10 @@
161	172	*/
162	173	private function upgrade_from_1_9()
163	174	{
164	175	if ( ! is_multisite() ) {
165		- update_option( 'autoptimize_css_include_inline', 'on' );
166		- 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' );
167	178	} else {
168	179	global $wpdb;
169	180	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
170	181	$original_blog_id = get_current_blog_id();
		@@ -169,10 +180,10 @@
169	180	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
170	181	$original_blog_id = get_current_blog_id();
171	182	foreach ( $blog_ids as $blog_id ) {
172	183	switch_to_blog( $blog_id );
173		- update_option( 'autoptimize_css_include_inline', 'on' );
174		- 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' );
175	186	}
176	187	switch_to_blog( $original_blog_id );
177	188	}
178	189	}
		@@ -202,12 +213,12 @@
202	213	* Helper for 2.2 autoptimize_extra_settings upgrade to avoid duplicate code
203	214	*/
204	215	private function do_2_2_settings_update()
205	216	{
206		- $nogooglefont = get_option( 'autoptimize_css_nogooglefont', '' );
207		- $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
	217	+ $nogooglefont = autoptimizeOptionWrapper::get_option( 'autoptimize_css_nogooglefont', '' );
	218	+ $ao_extrasetting = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
208	219	if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
209		- update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
	220	+ autoptimizeOptionWrapper::update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
210	221	}
211	222	delete_option( 'autoptimize_css_nogooglefont' );
212	223	}
213	224
		@@ -235,14 +246,39 @@
235	246	/**
236	247	* Migrate imgopt options from autoptimize_extra_settings to autoptimize_imgopt_settings
237	248	*/
238	249	private function upgrade_from_2_4() {
239		- $extra_settings = get_option( 'autoptimize_extra_settings' );
240		- $imgopt_settings = get_option( 'autoptimize_imgopt_settings' );
241		- if ( empty( $imgopt_settings ) ) {
242		- $imgopt_settings = autoptimizeConfig::get_ao_imgopt_default_options();
243		- $imgopt_settings['autoptimize_imgopt_checkbox_field_1'] = $extra_settings['autoptimize_extra_checkbox_field_5'];
244		- $imgopt_settings['autoptimize_imgopt_select_field_2'] = $extra_settings['autoptimize_extra_select_field_6'];
245		- update_option( 'autoptimize_imgopt_settings', $imgopt_settings );
	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 );
246	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 );
247	283	}
248	284	}