From 710489b7587d4ee44ad1d23868c568f1598a5358 Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Thu, 7 Mar 2024 19:09:21 +0200 Subject: [PATCH 1/6] add the code to replace webp settings with nextgen ones --- inc/admin/upgrader.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/inc/admin/upgrader.php b/inc/admin/upgrader.php index 010ac6f0..4c995f9f 100755 --- a/inc/admin/upgrader.php +++ b/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_rewrite', Imagify_Options::get_instance()->get( 'display_webp_method_rewrite', 0 ) ); + } } add_action( 'imagify_upgrade', '_imagify_new_upgrade', 10, 2 ); From a1a283628cbde321b7918289e5bd52fef568ecac Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Thu, 7 Mar 2024 19:15:03 +0200 Subject: [PATCH 2/6] remove default value from get --- inc/admin/upgrader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/admin/upgrader.php b/inc/admin/upgrader.php index 4c995f9f..5a1f5ed3 100755 --- a/inc/admin/upgrader.php +++ b/inc/admin/upgrader.php @@ -310,7 +310,7 @@ function _imagify_new_upgrade( $network_version, $site_version ) { 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_rewrite', Imagify_Options::get_instance()->get( 'display_webp_method_rewrite', 0 ) ); + Imagify_Options::get_instance()->set( 'display_nextgen_method_rewrite', Imagify_Options::get_instance()->get( 'display_webp_method_rewrite' ) ); } } add_action( 'imagify_upgrade', '_imagify_new_upgrade', 10, 2 ); From da020dc6b259d707ec8f38d8aef0584dac81473a Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Fri, 8 Mar 2024 08:06:13 +0200 Subject: [PATCH 3/6] add webp options back to the array --- inc/classes/class-imagify-options.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/inc/classes/class-imagify-options.php b/inc/classes/class-imagify-options.php index 32837762..87bce7bf 100644 --- a/inc/classes/class-imagify-options.php +++ b/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, From 7fe8a1963640261a6e64acfddf407bc0d8533ad2 Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Fri, 8 Mar 2024 08:07:23 +0200 Subject: [PATCH 4/6] update the plugin's version for testing --- imagify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagify.php b/imagify.php index 3a31e681..25e54174 100644 --- a/imagify.php +++ b/imagify.php @@ -3,7 +3,7 @@ * Plugin Name: Imagify * Plugin URI: https://wordpress.org/plugins/imagify/ * Description: Dramatically reduce image file sizes without losing quality, make your website load faster, boost your SEO and save money on your bandwidth using Imagify, the new most advanced image optimization tool. - * Version: 2.2 + * Version: 2.2.1 * Requires at least: 5.3 * Requires PHP: 7.0 * Author: Imagify – Optimize Images & Convert WebP & Avif @@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' ); // Imagify defines. -define( 'IMAGIFY_VERSION', '2.2' ); +define( 'IMAGIFY_VERSION', '2.2.1' ); define( 'IMAGIFY_SLUG', 'imagify' ); define( 'IMAGIFY_FILE', __FILE__ ); define( 'IMAGIFY_PATH', realpath( plugin_dir_path( IMAGIFY_FILE ) ) . '/' ); From e930c49d59721b2ed75daf365041a0a3291246fa Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Fri, 8 Mar 2024 08:14:36 +0200 Subject: [PATCH 5/6] correct the display method option name --- inc/admin/upgrader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/admin/upgrader.php b/inc/admin/upgrader.php index 5a1f5ed3..3ad5eb48 100755 --- a/inc/admin/upgrader.php +++ b/inc/admin/upgrader.php @@ -310,7 +310,7 @@ function _imagify_new_upgrade( $network_version, $site_version ) { 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_rewrite', Imagify_Options::get_instance()->get( 'display_webp_method_rewrite' ) ); + 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 ); From a91ab249aa6528c86d1d7dadb729e4b1630481a9 Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Fri, 8 Mar 2024 08:16:13 +0200 Subject: [PATCH 6/6] revert updating the plugin's version number --- imagify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagify.php b/imagify.php index 25e54174..3a31e681 100644 --- a/imagify.php +++ b/imagify.php @@ -3,7 +3,7 @@ * Plugin Name: Imagify * Plugin URI: https://wordpress.org/plugins/imagify/ * Description: Dramatically reduce image file sizes without losing quality, make your website load faster, boost your SEO and save money on your bandwidth using Imagify, the new most advanced image optimization tool. - * Version: 2.2.1 + * Version: 2.2 * Requires at least: 5.3 * Requires PHP: 7.0 * Author: Imagify – Optimize Images & Convert WebP & Avif @@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' ); // Imagify defines. -define( 'IMAGIFY_VERSION', '2.2.1' ); +define( 'IMAGIFY_VERSION', '2.2' ); define( 'IMAGIFY_SLUG', 'imagify' ); define( 'IMAGIFY_FILE', __FILE__ ); define( 'IMAGIFY_PATH', realpath( plugin_dir_path( IMAGIFY_FILE ) ) . '/' );