From ad199eb1f562f74501192a82806cc62d0b0cbb1b Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 25 Nov 2024 14:15:47 +0530 Subject: [PATCH 1/3] Fix cache data issue elementor widgets --- includes/abstract/feedzy-rss-feeds-admin-abstract.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/abstract/feedzy-rss-feeds-admin-abstract.php b/includes/abstract/feedzy-rss-feeds-admin-abstract.php index bbba08f9..552117ce 100644 --- a/includes/abstract/feedzy-rss-feeds-admin-abstract.php +++ b/includes/abstract/feedzy-rss-feeds-admin-abstract.php @@ -485,7 +485,7 @@ public function feedzy_rss( $atts, $content = '' ) { } $attributes .= 'data-' . esc_attr( $key ) . '="' . esc_attr( $val ) . '"'; } - $lazyload_cache_key = md5( sprintf( 'feedzy-lazy-%s', ( is_array( $feed_url ) ? implode( ',', $feed_url ) : $feed_url ) ) ); + $lazyload_cache_key = md5( sprintf( 'feedzy-lazy-%s-%d-%d', ( is_array( $feed_url ) ? implode( ',', $feed_url ) : $feed_url ), ( ! empty( $sc['max'] ) ? $sc['max'] : 1 ), ( ! empty( $sc['offset'] ) ? $sc['offset'] : 0 ) ) ); $content = get_transient( $lazyload_cache_key ); // the first time the shortcode is being called it will not have any content. @@ -577,7 +577,7 @@ public function feedzy_lazy_load( $data ) { $content = $this->render_content( $sc, $feed, $feed_url, '' ); // save the content as a transient so that whenever the feed is refreshed next, this stale content is displayed first. - $lazyload_cache_key = md5( sprintf( 'feedzy-lazy-%s', ( is_array( $feed_url ) ? implode( ',', $feed_url ) : $feed_url ) ) ); + $lazyload_cache_key = md5( sprintf( 'feedzy-lazy-%s-%d-%d', ( is_array( $feed_url ) ? implode( ',', $feed_url ) : $feed_url ), ( ! empty( $sc['max'] ) ? $sc['max'] : 1 ), ( ! empty( $sc['offset'] ) ? $sc['offset'] : 0 ) ) ); set_transient( $lazyload_cache_key, $content, apply_filters( 'feedzy_lazyload_cache_time', DAY_IN_SECONDS, $feed_url ) ); wp_send_json_success( array( 'content' => $content ) ); From 5bf5adf4daeb4e88191c208696d4a13bed8a666e Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 25 Nov 2024 14:38:02 +0530 Subject: [PATCH 2/3] Fix _load_textdomain_just_in_time early error --- includes/admin/feedzy-wp-widget.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/feedzy-wp-widget.php b/includes/admin/feedzy-wp-widget.php index 8e2a411d..33b398f1 100644 --- a/includes/admin/feedzy-wp-widget.php +++ b/includes/admin/feedzy-wp-widget.php @@ -37,7 +37,7 @@ class feedzy_wp_widget extends WP_Widget { * @param Feedzy_Rss_Feeds_Admin $plugin_admin The Feedzy_Rss_Feeds_Admin object. */ public function __construct( $plugin_admin = null ) { - parent::__construct( false, $name = __( 'Feedzy RSS Feeds', 'feedzy-rss-feeds' ) ); + parent::__construct( false, $name = FEEDZY_NAME ); self::$instance = $this; } From aaba5c6ec22b2af1cc9e9d8c4b7dc8f4c1405984 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 25 Nov 2024 17:37:46 +0530 Subject: [PATCH 3/3] Change the widget register method --- includes/admin/feedzy-wp-widget.php | 12 +----------- includes/feedzy-rss-feeds.php | 9 +++++++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/includes/admin/feedzy-wp-widget.php b/includes/admin/feedzy-wp-widget.php index 33b398f1..9598a9d9 100644 --- a/includes/admin/feedzy-wp-widget.php +++ b/includes/admin/feedzy-wp-widget.php @@ -37,7 +37,7 @@ class feedzy_wp_widget extends WP_Widget { * @param Feedzy_Rss_Feeds_Admin $plugin_admin The Feedzy_Rss_Feeds_Admin object. */ public function __construct( $plugin_admin = null ) { - parent::__construct( false, $name = FEEDZY_NAME ); + parent::__construct( false, $name = __( 'Feedzy RSS Feeds', 'feedzy-rss-feeds' ) ); self::$instance = $this; } @@ -57,16 +57,6 @@ public static function get_instance() { return self::$instance; } - /** - * The register method for registering this widget class - * - * @since 3.0.0 - * @access public - */ - public function registerWidget() { - register_widget( 'feedzy_wp_widget' ); - } - /** * The widget form creation * diff --git a/includes/feedzy-rss-feeds.php b/includes/feedzy-rss-feeds.php index d8f176c3..d3b48e50 100644 --- a/includes/feedzy-rss-feeds.php +++ b/includes/feedzy-rss-feeds.php @@ -229,8 +229,13 @@ private function define_admin_hooks() { add_shortcode( 'feedzy-rss', array( self::$instance->admin, 'feedzy_rss' ) ); - $plugin_widget = new feedzy_wp_widget(); - self::$instance->loader->add_action( 'widgets_init', $plugin_widget, 'registerWidget', 10 ); + add_action( + 'widgets_init', + function () { + register_widget( 'feedzy_wp_widget' ); + } + ); + self::$instance->loader->add_action( 'rest_api_init', self::$instance->admin, 'rest_route', 10 ); // Wizard screen setup.