Merge branch 'master' into 64522

WPDevelopers · Jul 24, 2024 · fe6b657 · fe6b657
2 parents cd69b91 + 1af08fc
commit fe6b657
Show file tree

Hide file tree

Showing 6 changed files with 174 additions and 174 deletions.
diff --git a/assets/admin/images/essential-blocks/eb-promo-img5.png b/assets/admin/images/essential-blocks/eb-promo-img5.png
diff --git a/assets/admin/js/eael-essential-blocks-promo.js b/assets/admin/js/eael-essential-blocks-promo.js
@@ -10,7 +10,7 @@
 
     function essential_block_button_init() {
         if (!$('#eael-eb-popup-button').length && !$is_popup_button_added) {
-            $gb_editor_panel.find('.edit-post-header__settings').prepend($('#eael-gb-eb-button-template').html());
+            $gb_editor_panel.find('.edit-post-header__settings, .editor-header__settings').prepend($('#eael-gb-eb-button-template').html());
             if ($('#eael-eb-popup-button').length) {
                 $is_popup_button_added = true;
             }

diff --git a/essential_adons_elementor.php b/essential_adons_elementor.php
@@ -4,14 +4,14 @@
  * Description: The Essential plugin you install after Elementor! Packed with 40+ stunning free elements including Advanced Data Table, Event Calendar, Filterable Gallery, WooCommerce, and many more.
  * Plugin URI: https://essential-addons.com/elementor/
  * Author: WPDeveloper
- * Version: 5.9.26
+ * Version: 5.9.27
  * Author URI: https://wpdeveloper.com/
  * Text Domain: essential-addons-for-elementor-lite
  * Domain Path: /languages
  *
  * WC tested up to: 9.0
- * Elementor tested up to: 3.22
- * Elementor Pro tested up to: 3.22
+ * Elementor tested up to: 3.23
+ * Elementor Pro tested up to: 3.23
  */
 
 if (!defined('ABSPATH')) {
@@ -27,7 +27,7 @@
 define('EAEL_PLUGIN_BASENAME', plugin_basename(__FILE__));
 define('EAEL_PLUGIN_PATH', trailingslashit(plugin_dir_path(__FILE__)));
 define('EAEL_PLUGIN_URL', trailingslashit(plugins_url('/', __FILE__)));
-define('EAEL_PLUGIN_VERSION', '5.9.26');
+define('EAEL_PLUGIN_VERSION', '5.9.27');
 define('EAEL_ASSET_PATH', wp_upload_dir()['basedir'] . '/essential-addons-elementor');
 define('EAEL_ASSET_URL', wp_upload_dir()['baseurl'] . '/essential-addons-elementor');
 /**

diff --git a/includes/Elements/Event_Calendar.php b/includes/Elements/Event_Calendar.php
@@ -13,6 +13,7 @@
 use \Elementor\Group_Control_Box_Shadow;
 use \Elementor\Group_Control_Typography;
 use \Elementor\Repeater;
+use Elementor\Utils;
 use \Elementor\Widget_Base;
 use \Essential_Addons_Elementor\Classes\Helper;
 
@@ -3378,22 +3379,15 @@ public function get_manual_calendar_events($settings)
                 $settings_eael_event_global_text_color = $this->fetch_color_or_global_color($event, 'eael_event_text_color');
                 $settings_eael_event_global_popup_ribbon_color = $this->fetch_color_or_global_color($event, 'eael_event_border_color');
 
-                $_custom_attributes = $event['eael_event_link']['custom_attributes'];
-                $_custom_attributes = explode(',', $_custom_attributes );
+	            $_custom_attributes = Utils::parse_custom_attributes( $event['eael_event_link']['custom_attributes'] );
                 $custom_attributes  = [];
 
 	            if ( $_custom_attributes ) {
-		            foreach ( $_custom_attributes as $attribute ) {
-			            if ( $attribute ) {
-				            $attribute_set = explode( '|', $attribute );
-
-				            if ( in_array( trim( strtolower( $attribute_set[0] ) ), $this->xssAttributes() ) ) {
-					            continue;
-				            }
-
+		            foreach ( $_custom_attributes as $key=>$value ) {
+			            if ( $key ) {
 				            $custom_attributes[] = [
-					            'key'   => sanitize_text_field( $attribute_set[0] ),
-					            'value' => isset( $attribute_set[1] ) ? esc_attr( $attribute_set[1] ) : ''
+					            'key'   => sanitize_text_field( $key ),
+					            'value' => esc_attr( $value )
 				            ];
 			            }
 		            }