Merge pull request #849 from wp-media/fix/848-webp-upgrade-routine

Preserve webp setting options with update from versions older than 2.2

inc/admin/upgrader.php

@@ -307,6 +307,11 @@ function _imagify_new_upgrade( $network_version, $site_version ) {
 	if ( version_compare( $site_version, '2.0' ) < 0 ) {
 		Imagify_Options::get_instance()->set( 'optimization_level', 2 );
 	}
+
+	if ( version_compare( $site_version, '2.2' ) < 0 ) {
+		Imagify_Options::get_instance()->set( 'display_nextgen', Imagify_Options::get_instance()->get( 'display_webp', 0 ) );
+		Imagify_Options::get_instance()->set( 'display_nextgen_method', Imagify_Options::get_instance()->get( 'display_webp_method' ) );
+	}
 }
 add_action( 'imagify_upgrade', '_imagify_new_upgrade', 10, 2 );
 

inc/classes/class-imagify-options.php

@@ -36,11 +36,14 @@ class Imagify_Options extends Imagify_Abstract_Options {
 		'resize_larger_w'        => 0,
 		'display_nextgen'        => 0,
 		'display_nextgen_method' => 'picture',
+		'display_webp'        => 0,
+		'display_webp_method' => 'picture',
 		'cdn_url'                => '',
 		'disallowed-sizes'       => [],
 		'admin_bar_menu'         => 0,
 		'partner_links'          => 0,
 		'convert_to_avif'        => 0,
+		'convert_to_webp'        => 0,
 	];
 
 	/**
@@ -131,6 +134,7 @@ public function sanitize_and_validate_value( $key, $value, $default ) {
 			case 'resize_larger':
 			case 'convert_to_webp':
 			case 'display_nextgen':
+			case 'display_webp':
 			case 'admin_bar_menu':
 			case 'partner_links':
 			case 'convert_to_avif':
@@ -160,6 +164,7 @@ public function sanitize_and_validate_value( $key, $value, $default ) {
 				return array_fill_keys( $value, 1 );
 
 			case 'display_nextgen_method':
+			case 'display_webp_method':
 				$values = [
 					'picture' => 1,
 					'rewrite' => 1,