From cef85142df07a3dcac1df4e5ac6858782a344537 Mon Sep 17 00:00:00 2001 From: Al-Amin Firdows Date: Fri, 18 Apr 2025 12:57:39 +0600 Subject: [PATCH 1/4] fix: plugin deactivation error --- flywp.php | 4 +++- includes/Api/UpdatesData.php | 16 ++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/flywp.php b/flywp.php index 6833a66..6023e8c 100644 --- a/flywp.php +++ b/flywp.php @@ -91,7 +91,9 @@ public function activate() { * @return void */ public function deactivate() { - ( new FlyWP\Api\UpdatesData() )->deactivate(); + if ( $timestamp = wp_next_scheduled( FlyWP\Api\UpdatesData::CRON_HOOK ) ) { + wp_unschedule_event( $timestamp, FlyWP\Api\UpdatesData::CRON_HOOK ); + } } /** diff --git a/includes/Api/UpdatesData.php b/includes/Api/UpdatesData.php index 26b33e8..fa3dbc5 100644 --- a/includes/Api/UpdatesData.php +++ b/includes/Api/UpdatesData.php @@ -2,11 +2,9 @@ namespace FlyWP\Api; -use WP_Error; - class UpdatesData { - private const CRON_HOOK = 'flywp_send_updates_data'; - private const CRON_INTERVAL = 'twicedaily'; + public const CRON_HOOK = 'flywp_send_updates_data'; + public const CRON_INTERVAL = 'twicedaily'; /** * UpdatesData constructor. @@ -236,14 +234,4 @@ private function load_required_files(): void { require_once ABSPATH . 'wp-admin/includes/update.php'; } } - - /** - * Deactivate the scheduler when the plugin is deactivated. - */ - public function deactivate(): void { - $timestamp = wp_next_scheduled( self::CRON_HOOK ); - if ( $timestamp ) { - wp_unschedule_event( $timestamp, self::CRON_HOOK ); - } - } } From 3d70b1539a7bbce0ead800d3f132e71a868022cc Mon Sep 17 00:00:00 2001 From: Al-Amin Firdows Date: Fri, 18 Apr 2025 13:03:33 +0600 Subject: [PATCH 2/4] fix: ensure proper unscheduling of cron event in deactivate method --- flywp.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flywp.php b/flywp.php index 6023e8c..7820ba6 100644 --- a/flywp.php +++ b/flywp.php @@ -91,7 +91,9 @@ public function activate() { * @return void */ public function deactivate() { - if ( $timestamp = wp_next_scheduled( FlyWP\Api\UpdatesData::CRON_HOOK ) ) { + $timestamp = wp_next_scheduled( FlyWP\Api\UpdatesData::CRON_HOOK ); + + if ( $timestamp ) { wp_unschedule_event( $timestamp, FlyWP\Api\UpdatesData::CRON_HOOK ); } } From 6b5546e8584fd457497283cd6c486e54c126b355 Mon Sep 17 00:00:00 2001 From: Al-Amin Firdows Date: Fri, 18 Apr 2025 13:09:30 +0600 Subject: [PATCH 3/4] chore: fix phpcs --- flywp.php | 1 - 1 file changed, 1 deletion(-) diff --git a/flywp.php b/flywp.php index 7820ba6..8b43b6e 100644 --- a/flywp.php +++ b/flywp.php @@ -92,7 +92,6 @@ public function activate() { */ public function deactivate() { $timestamp = wp_next_scheduled( FlyWP\Api\UpdatesData::CRON_HOOK ); - if ( $timestamp ) { wp_unschedule_event( $timestamp, FlyWP\Api\UpdatesData::CRON_HOOK ); } From 95ed89afb5b75dbb4fd490086c2af9c1d68587b4 Mon Sep 17 00:00:00 2001 From: Al-Amin Firdows Date: Fri, 18 Apr 2025 13:12:22 +0600 Subject: [PATCH 4/4] fix: correct comment for plugin deactivation hook --- flywp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flywp.php b/flywp.php index 8b43b6e..7ad0224 100644 --- a/flywp.php +++ b/flywp.php @@ -86,7 +86,7 @@ public function activate() { } /** - * Plugin activation hook. + * Plugin deactivation hook. * * @return void */