Merge pull request #807 from brainstormforce/release-candidate

Version 1.6.30
brainstormforce · May 14, 2024 · d8616b3 · d8616b3
2 parents 5997f88 + e2422cc
commit d8616b3
Show file tree

Hide file tree

Showing 24 changed files with 2,390 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 4.4  
 **Requires PHP:** 5.4  
 **Tested up to:** 6.5  
-**Stable tag:** 1.6.29  
+**Stable tag:** 1.6.30  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -140,6 +140,9 @@ This same applies when you are creating your Header/Footer using this plugin.
 
 ## Changelog ##
 
+### 1.6.30 ###
+- Fix: Improved error messages during plugin activation.
+
 ### 1.6.29 ###
 - Fix: Navigation Menu – The submenu container opens without hovering over the parent menu item.
 - Fix: This update addressed a security bug. Props to Wordfence.

diff --git a/composer.lock b/composer.lock
diff --git a/header-footer-elementor.php b/header-footer-elementor.php
@@ -7,14 +7,14 @@
  * Author URI:  https://www.brainstormforce.com/
  * Text Domain: header-footer-elementor
  * Domain Path: /languages
- * Version: 1.6.29
+ * Version: 1.6.30
  * Elementor tested up to: 3.21
  * Elementor Pro tested up to: 3.21
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.29' );
+define( 'HFE_VER', '1.6.30' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );
@@ -26,11 +26,6 @@
  */
 require_once HFE_DIR . '/inc/class-header-footer-elementor.php';
 
-/**
- * Include Composer autoloader.
- */
-require_once HFE_DIR . 'vendor/autoload.php';
-
 /**
  * Load the Plugin Class.
  */

diff --git a/inc/class-header-footer-elementor.php b/inc/class-header-footer-elementor.php
@@ -111,6 +111,21 @@ function __construct() {
 				require_once HFE_DIR . 'admin/bsf-analytics/class-bsf-analytics-loader.php';
 			}
 
+			if ( ! class_exists( 'Sanitizer' ) ) {
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/Sanitizer.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/data/AttributeInterface.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/data/TagInterface.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/data/AllowedAttributes.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/data/AllowedTags.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/data/XPath.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/ElementReference/Resolver.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/ElementReference/Subject.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/ElementReference/Usage.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/Exceptions/NestingException.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/Helper.php';
+				require_once HFE_DIR . 'inc/lib/svg-sanitizer/src/Sanitizer.php';
+			}
+
 			$bsf_analytics = BSF_Analytics_Loader::get_instance();
 
 			$bsf_analytics->set_entity(

diff --git a/inc/class-hfe-settings-page.php b/inc/class-hfe-settings-page.php
@@ -515,16 +515,16 @@ public function get_about_html() {
 	 * @return array
 	 */
 	protected function get_white_label() {
-		$white_labels = is_callable( 'Astra_Admin_Helper::get_admin_settings_option' ) ? \Astra_Admin_Helper::get_admin_settings_option( '_astra_ext_white_label', true ) : array();
+		$white_labels = is_callable( 'Astra_Admin_Helper::get_admin_settings_option' ) ? \Astra_Admin_Helper::get_admin_settings_option( '_astra_ext_white_label', true ) : [];
 
 		$theme_name = ! empty( $white_labels['astra']['name'] ) ? $white_labels['astra']['name'] : 'Astra';
 
-		return array(
+		return [
 			'theme_name'  => $theme_name,
 			'description' => ! empty( $white_labels['astra']['description'] ) ? $white_labels['astra']['description'] : esc_html( sprintf( __( 'Powering over 1+ Million websites, %s is loved for the fast performance and ease of use it offers. It is suitable for all kinds of websites like blogs, portfolios, business, and WooCommerce stores.', 'header-footer-elementor' ), esc_html( $theme_name ) ) ),
 			'theme_icon'  => ! empty( $white_labels['astra']['icon'] ) ? $white_labels['astra']['icon'] : '',
 			'author_url'  => ! empty( $white_labels['astra']['author_url'] ) ? $white_labels['astra']['author_url'] : 'https://wpastra.com/',
-		);
+		];
 	}
 
 	/**