resolved conflicts

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.24  
+**Stable tag:** 1.6.24.1  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -141,6 +141,8 @@ This same applies when you are creating your Header/Footer using this plugin.
 ## Changelog ##
 
 ### 1.6.25 ###
+- Security Fix: Hardened the security of the plugin. Props: Wordfence.
+- Fix: Automatic translation support for templates on Specific Pages / Posts / Taxonomies, etc.
 - Fix: Navigation Menu - Multistep submenu fails to display when a border radius is applied to dropdown.
 
 ### 1.6.24 ###

inc/lib/target-rule/class-astra-target-rules-fields.php

@@ -1266,6 +1266,18 @@ public function get_posts_by_conditions( $post_type, $option ) {
 			$current_post_id   = false;
 			$q_obj             = get_queried_object();
 
+			$current_id      = esc_sql( get_the_id() );
+			// Find WPML Object ID for current page.
+			if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+				$default_lang = apply_filters( 'wpml_default_language', '' );
+				$current_lang = apply_filters( 'wpml_current_language', '' );
+
+				if( $default_lang !== $current_lang ) {
+					$current_post_type 	= get_post_type( $current_id );
+					$current_id = apply_filters( 'wpml_object_id', $current_id, $current_post_type, true, $default_lang );
+				}
+			}
+
 			$location = isset( $option['location'] ) ? esc_sql( $option['location'] ) : '';
 
 			$query = "SELECT p.ID, pm.meta_value FROM {$wpdb->postmeta} as pm
@@ -1308,14 +1320,12 @@ public function get_posts_by_conditions( $post_type, $option ) {
 					$meta_args .= " OR pm.meta_value LIKE '%\"special-blog\"%'";
 					break;
 				case 'is_front_page':
-					$current_id      = esc_sql( get_the_id() );
 					$current_post_id = $current_id;
 					$meta_args      .= " OR pm.meta_value LIKE '%\"special-front\"%'";
 					$meta_args      .= " OR pm.meta_value LIKE '%\"{$current_post_type}|all\"%'";
 					$meta_args      .= " OR pm.meta_value LIKE '%\"post-{$current_id}\"%'";
 					break;
 				case 'is_singular':
-					$current_id      = esc_sql( get_the_id() );
 					$current_post_id = $current_id;
 					$meta_args      .= " OR pm.meta_value LIKE '%\"basic-singulars\"%'";
 					$meta_args      .= " OR pm.meta_value LIKE '%\"{$current_post_type}|all\"%'";
@@ -1333,7 +1343,7 @@ public function get_posts_by_conditions( $post_type, $option ) {
 					$meta_args .= " OR pm.meta_value LIKE '%\"special-woo-shop\"%'";
 					break;
 				case '':
-					$current_post_id = get_the_id();
+					$current_post_id = $current_id;
 					break;
 			}
 

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

@@ -1948,7 +1948,7 @@ protected function render() {
 			<div <?php $this->print_render_attribute_string( 'hfe-flyout' ); ?> >
 				<div class="hfe-flyout-overlay elementor-clickable"></div>
 				<div class="hfe-flyout-container">
-					<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 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 esc_attr( $settings['flyout_layout'] ); ?>" data-flyout-type="<?php echo esc_attr( $settings['flyout_type'] ); ?>">
 						<div class="hfe-flyout-content push">
 							<nav <?php $this->print_render_attribute_string( 'hfe-nav-menu' ); ?>>
 								<?php echo wp_nav_menu( $args ); ?>

readme.txt

@@ -5,7 +5,7 @@ Donate link: https://www.paypal.me/BrainstormForce
 Requires at least: 4.4
 Requires PHP: 5.4
 Tested up to: 6.4.1
-Stable tag: 1.6.24
+Stable tag: 1.6.24.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -140,10 +140,12 @@ This same applies when you are creating your Header/Footer using this plugin.
 
 == Changelog ==
 
-### 1.6.25 ###
+= 1.6.25 =
+- Security Fix: Hardened the security of the plugin. Props: Wordfence.
+- Fix: Automatic translation support for templates on Specific Pages / Posts / Taxonomies, etc.
 - Fix: Navigation Menu - Multistep submenu fails to display when a border radius is applied to dropdown.
 
-### 1.6.24 ###
+= 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.