Merge pull request #764 from brainstormforce/release-candidate

Build: Release PR RC to Master PR for v1.6.24

README.md

@@ -5,7 +5,7 @@
 **Requires at least:** 4.4  
 **Requires PHP:** 5.4  
 **Tested up to:** 6.4.1  
-**Stable tag:** 1.6.23  
+**Stable tag:** 1.6.24  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -140,6 +140,11 @@ This same applies when you are creating your Header/Footer using this plugin.
 
 ## Changelog ##
 
+### 1.6.24 ###
+- Improvement: Compatibility with latest Elementor and Elementor Pro 3.19 version.
+- Fix: White Label - Astra's theme name does not change when Astra is white-labeled. 
+- Fix: Navigation Menu - Language switcher flags not displaying when using Polylang plugin.
+
 ### 1.6.23 ###
 - Fix: This update addressed a security bug. Props to WordPress Plugin Review Team and Plugin Vulnerabilities Team for reporting it to our team. Please make sure you are using the latest version on your website.
 

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.23
- * Elementor tested up to: 3.18
- * Elementor Pro tested up to: 3.18
+ * Version: 1.6.24
+ * Elementor tested up to: 3.19
+ * Elementor Pro tested up to: 3.19
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.23' );
+define( 'HFE_VER', '1.6.24' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );

inc/class-hfe-settings-page.php

@@ -361,7 +361,7 @@ public function get_guide_html() {
 		<div class="hfe-admin-about-section hfe-admin-columns hfe-admin-guide-section<?php echo esc_attr( $subscribe_flag ); ?>">
 
 			<div class="hfe-admin-column-50">
-				<div class="hfe-admin-about-section-column">					
+				<div class="hfe-admin-about-section-column">
 					<h2><?php esc_html_e( 'Create Impressive Header and Footer Designs', 'header-footer-elementor' ); ?></h2>
 					<p><?php esc_html_e( 'Elementor Header & Footer Builder plugin lets you build impactful navigation for your website very easily. Before we begin, we would like to know more about you. This will help us to serve you better.', 'header-footer-elementor' ); ?></p>
 				</div>
@@ -508,12 +508,34 @@ public function get_about_html() {
 		$this->output_about_addons();
 	}
 
+	/**
+	 * Function for Astra Pro white labels with defaults.
+	 *
+	 * @since 1.6.24
+	 * @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();
+
+		$theme_name = ! empty( $white_labels['astra']['name'] ) ? $white_labels['astra']['name'] : 'Astra';
+
+		return array(
+			'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/',
+		);
+	}
+
 	/**
 	 * Display the General Info section of About tab.
 	 *
 	 * @since 1.6.0
 	 */
 	protected function output_about_info() {
+
+		$white_labels = $this->get_white_label();
+
 		?>
 
 		<div class="hfe-admin-about-section hfe-admin-columns hfe-admin-about-us">
@@ -527,7 +549,7 @@ protected function output_about_info() {
 
 				<p><?php esc_html_e( 'Trusted by more than 1+ Million users, Elementor Header & Footer Builder is a modern way to build advanced navigation for your website.', 'header-footer-elementor' ); ?></p>
 
-				<p><?php esc_html_e( 'This plugin is brought to you by the same team behind the popular WordPress theme Astra and a series of Ultimate Addons plugins.', 'header-footer-elementor' ); ?></p>
+				<p><?php printf( esc_html__( 'This plugin is brought to you by the same team behind the popular WordPress theme %s and a series of Ultimate Addons plugins.', 'header-footer-elementor' ), esc_html( $white_labels['theme_name'] ) ); ?>
 
 			</div>
 
@@ -706,18 +728,20 @@ protected function get_plugin_data( $addon, $details, $all_plugins, $all_themes
 	 */
 	protected function get_bsf_plugins() {
 
+		$white_labels = $this->get_white_label();
+
 		$images_url = HFE_URL . 'assets/images/settings/';
 
 		return [
 
 			'astra'                                     => [
-				'icon'    => $images_url . 'plugin-astra.png',
+				'icon'    => ! empty( $white_labels['theme_icon'] ) ? $white_labels['theme_icon'] : $images_url . 'plugin-astra.png',
 				'type'    => 'theme',
-				'name'    => esc_html__( 'Astra Theme', 'header-footer-elementor' ),
-				'desc'    => esc_html__( 'Powering over 1+ Million websites, Astra 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' ),
+				'name'    => $white_labels['theme_name'],
+				'desc'    => $white_labels['description'],
 				'wporg'   => 'https://wordpress.org/themes/astra/',
 				'url'     => 'https://downloads.wordpress.org/theme/astra.zip',
-				'siteurl' => 'https://wpastra.com/',
+				'siteurl' => $white_labels['author_url'],
 				'pro'     => false,
 				'slug'    => 'astra',
 			],

inc/widgets-manager/widgets/class-navigation-menu.php

@@ -1931,8 +1931,6 @@ protected function render() {
 			add_filter( 'nav_menu_li_values', [ $this, 'handle_li_values' ] );
 		}
 
-		$menu_html = wp_nav_menu( $args );
-
 		if ( 'flyout' === $settings['layout'] ) {
 
 			$this->add_render_attribute( 'hfe-flyout', 'class', 'hfe-flyout-wrapper' );
@@ -1953,7 +1951,7 @@ protected function render() {
 					<div id="hfe-flyout-content-id-<?php echo esc_attr( $this->get_id() ); ?>" class="hfe-side hfe-flyout-<?php echo esc_attr( $settings['flyout_layout'] ); ?> hfe-flyout-open" data-layout="<?php echo wp_kses_post( $settings['flyout_layout'] ); ?>" data-flyout-type="<?php echo wp_kses_post( $settings['flyout_type'] ); ?>">
 						<div class="hfe-flyout-content push">
 							<nav <?php $this->print_render_attribute_string( 'hfe-nav-menu' ); ?>>
-								<?php echo wp_kses_post( $menu_html ); ?>
+								<?php echo wp_nav_menu( $args ); ?>
 							</nav>
 							<div class="elementor-clickable hfe-flyout-close" tabindex="0">
 								<?php echo isset( $menu_close_icons[1] ) ? $menu_close_icons[1] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
@@ -2029,7 +2027,7 @@ protected function render() {
 					</div>
 				</div>
 				<nav <?php $this->print_render_attribute_string( 'hfe-nav-menu' ); ?>>
-					<?php echo wp_kses_post( $menu_html ); ?>
+					<?php echo wp_nav_menu( $args ); ?> 
 				</nav>
 			</div>
 			<?php