From 412a38f873845d645d1beaa27324a14edc3cda64 Mon Sep 17 00:00:00 2001 From: Marco Pereirinha Date: Wed, 22 Jul 2020 14:32:53 +0100 Subject: [PATCH 1/3] Add method to check is auto sync is enabled --- .../php/class-settings-page.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php index 46d32d451..6a1c6200d 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php @@ -913,4 +913,19 @@ public function set_active_page( $page_slug ) { $this->active_page = $page_slug; } } + + /** + * Checks if auto sync feature is enabled. + * + * @return bool + */ + public function is_auto_sync_enabled() { + $settings = $this->get_config(); + + if ( ! empty( $settings['sync_media']['auto_sync'] ) && 'on' === $settings['sync_media']['auto_sync'] ) { + return true; + } + + return false; + } } From f11d629dc9250e95dfc2ce3b67b33b6545107c78 Mon Sep 17 00:00:00 2001 From: Marco Pereirinha Date: Wed, 22 Jul 2020 14:33:28 +0100 Subject: [PATCH 2/3] Leverage the new method to check if auto sync is enabled --- .../php/sync/class-upload-sync.php | 2 +- .../ui-definitions/tabs/sync-media-content.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php index b7a6022d7..0e7c2f7ed 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php @@ -167,7 +167,7 @@ public function handle_bulk_actions( $location, $action, $post_ids ) { * @return bool */ public function auto_sync_enabled( $enabled, $post_id ) { - if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) { + if ( $this->plugin->components['settings']->is_auto_sync_enabled() ) { $enabled = true; } diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-content.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-content.php index 5aad4e476..a37756fc0 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-content.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-content.php @@ -5,10 +5,7 @@ * @package Cloudinary */ -$autosync = false; -if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) { - $autosync = true; -} +$autosync = $this->plugin->components['settings']->is_auto_sync_enabled(); ?> plugin->config['connect'] ) ) : ?>
From b7a7ac608bf429815c3df52f6fb0b45b58d3276b Mon Sep 17 00:00:00 2001 From: Marco Pereirinha Date: Wed, 22 Jul 2020 14:33:57 +0100 Subject: [PATCH 3/3] Syncing flag should only be set if auto sync is enabled --- .../php/class-sync.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php index a33f2208f..7845b1904 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php @@ -109,7 +109,7 @@ public function is_synced( $post_id ) { return true; } - if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) { + if ( $this->plugin->components['settings']->is_auto_sync_enabled() && apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) { update_post_meta( $post_id, Sync::META_KEYS['syncing'], true ); }