← All changes | classes/autoptimizeVersionUpdatesHandler.php +82 -15 2.4.4 → 3.1.4 View file →

		@@ -46,13 +46,31 @@
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;
	67	+ // No break, intentionally, so all upgrades are ran during a single request...
	68	+ case '3.0':
	69	+ // nothing.
	70	+ case '3.1':
	71	+ $this->upgrade_from_3_1();
	72	+ $major_update = false;
55	73	}
56	74
57	75	if ( true === $major_update ) {
58	76	$this->on_major_version_update();
		@@ -67,9 +85,9 @@
67	85	* @param string $target Target version to check against (ie., the currently running one).
68	86	*/
69	87	public static function check_installed_and_update( $target )
70	88	{
71		- $db_version = get_option( 'autoptimize_version', 'none' );
	89	+ $db_version = autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' );
72	90	if ( $db_version !== $target ) {
73	91	if ( 'none' === $db_version ) {
74	92	add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
75	93	} else {
		@@ -77,9 +95,9 @@
77	95	$updater->run_needed_major_upgrades();
78	96	}
79	97
80	98	// Versions differed, upgrades happened if needed, store the new version.
81		- update_option( 'autoptimize_version', $target );
	99	+ autoptimizeOptionWrapper::update_option( 'autoptimize_version', $target );
82	100	}
83	101	}
84	102
85	103	/**
		@@ -101,9 +119,9 @@
101	119	*/
102	120	private function upgrade_from_1_6()
103	121	{
104	122	// If user was on version 1.6.x, force advanced options to be shown by default.
105		- update_option( 'autoptimize_show_adv', '1' );
	123	+ autoptimizeOptionWrapper::update_option( 'autoptimize_show_adv', '1' );
106	124
107	125	// And remove old options.
108	126	$to_delete_options = array(
109	127	'autoptimize_cdn_css',
		@@ -126,15 +144,15 @@
126	144	*/
127	145	private function upgrade_from_1_7()
128	146	{
129	147	if ( ! is_multisite() ) {
130		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	148	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
131	149	if ( empty( $css_exclude ) ) {
132	150	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
133	151	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
134	152	$css_exclude .= ', dashicons.min.css';
135	153	}
136		- update_option( 'autoptimize_css_exclude', $css_exclude );
	154	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
137	155	} else {
138	156	global $wpdb;
139	157	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
140	158	$original_blog_id = get_current_blog_id();
		@@ -139,15 +157,15 @@
139	157	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
140	158	$original_blog_id = get_current_blog_id();
141	159	foreach ( $blog_ids as $blog_id ) {
142	160	switch_to_blog( $blog_id );
143		- $css_exclude = get_option( 'autoptimize_css_exclude' );
	161	+ $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
144	162	if ( empty( $css_exclude ) ) {
145	163	$css_exclude = 'admin-bar.min.css, dashicons.min.css';
146	164	} elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
147	165	$css_exclude .= ', dashicons.min.css';
148	166	}
149		- update_option( 'autoptimize_css_exclude', $css_exclude );
	167	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
150	168	}
151	169	switch_to_blog( $original_blog_id );
152	170	}
153	171	}
		@@ -160,10 +178,10 @@
160	178	*/
161	179	private function upgrade_from_1_9()
162	180	{
163	181	if ( ! is_multisite() ) {
164		- update_option( 'autoptimize_css_include_inline', 'on' );
165		- update_option( 'autoptimize_js_include_inline', 'on' );
	182	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
	183	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
166	184	} else {
167	185	global $wpdb;
168	186	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
169	187	$original_blog_id = get_current_blog_id();
		@@ -168,10 +186,10 @@
168	186	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
169	187	$original_blog_id = get_current_blog_id();
170	188	foreach ( $blog_ids as $blog_id ) {
171	189	switch_to_blog( $blog_id );
172		- update_option( 'autoptimize_css_include_inline', 'on' );
173		- update_option( 'autoptimize_js_include_inline', 'on' );
	190	+ autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
	191	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
174	192	}
175	193	switch_to_blog( $original_blog_id );
176	194	}
177	195	}
		@@ -201,12 +219,12 @@
201	219	* Helper for 2.2 autoptimize_extra_settings upgrade to avoid duplicate code
202	220	*/
203	221	private function do_2_2_settings_update()
204	222	{
205		- $nogooglefont = get_option( 'autoptimize_css_nogooglefont', '' );
206		- $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
	223	+ $nogooglefont = autoptimizeOptionWrapper::get_option( 'autoptimize_css_nogooglefont', '' );
	224	+ $ao_extrasetting = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
207	225	if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
208		- update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
	226	+ autoptimizeOptionWrapper::update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
209	227	}
210	228	delete_option( 'autoptimize_css_nogooglefont' );
211	229	}
212	230
		@@ -228,6 +246,55 @@
228	246	}
229	247
230	248	// Save the data.
231	249	_set_cron_array( $jobs );
	250	+ }
	251	+
	252	+ /**
	253	+ * Migrate imgopt options from autoptimize_extra_settings to autoptimize_imgopt_settings
	254	+ */
	255	+ private function upgrade_from_2_4() {
	256	+ $extra_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
	257	+ $imgopt_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings', '' );
	258	+ if ( empty( $imgopt_settings ) && ! empty( $extra_settings ) ) {
	259	+ $imgopt_settings = autoptimizeConfig::get_ao_imgopt_default_options();
	260	+ if ( array_key_exists( 'autoptimize_extra_checkbox_field_5', $extra_settings ) ) {
	261	+ $imgopt_settings['autoptimize_imgopt_checkbox_field_1'] = $extra_settings['autoptimize_extra_checkbox_field_5'];
	262	+ }
	263	+ if ( array_key_exists( 'autoptimize_extra_select_field_6', $extra_settings ) ) {
	264	+ $imgopt_settings['autoptimize_imgopt_select_field_2'] = $extra_settings['autoptimize_extra_select_field_6'];
	265	+ }
	266	+ autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_settings', $imgopt_settings );
	267	+ }
	268	+ }
	269	+
	270	+ /**
	271	+ * Remove CCSS request limit option + update jquery exclusion to include WordPress 5.6 jquery.min.js.
	272	+ */
	273	+ private function upgrade_from_2_7() {
	274	+ delete_option( 'autoptimize_ccss_rlimit' );
	275	+ $js_exclusions = get_option( 'autoptimize_js_exclude', '' );
	276	+ if ( strpos( $js_exclusions, 'js/jquery/jquery.js' ) !== false && strpos( $js_exclusions, 'js/jquery/jquery.min.js' ) === false ) {
	277	+ $js_exclusions .= ', js/jquery/jquery.min.js';
	278	+ autoptimizeOptionWrapper::update_option( 'autoptimize_js_exclude', $js_exclusions );
	279	+ }
	280	+ }
	281	+
	282	+ /**
	283	+ * Set an option to indicate the AO installation predates the compatibility logic, this way we
	284	+ * can avoid adding compatibility code that is likely not needed and maybe not wanted as it
	285	+ * can introduce performance regressions.
	286	+ */
	287	+ private function upgrade_from_2_9_before_compatibility() {
	288	+ autoptimizeOptionWrapper::update_option( 'autoptimize_installed_before_compatibility', true );
	289	+ }
	290	+
	291	+ /**
	292	+ * If the 404 handler is active, delete the current PHP-file so it can be re-created to fix the double underscore bug.
	293	+ */
	294	+ private function upgrade_from_3_1() {
	295	+ if ( autoptimizeCache::do_fallback() && version_compare( autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ), '3.1.2', 'lt' ) ) {
	296	+ $_fallback_php = trailingslashit( WP_CONTENT_DIR ) . 'autoptimize_404_handler.php';
	297	+ @unlink( $_fallback_php ); // @codingStandardsIgnoreLine
	298	+ }
232	299	}
233	300	}