Skip to content

Commit

Permalink
Merge pull request #744 from brainstormforce/hot-fix
Browse files Browse the repository at this point in the history
Fix: Header and Footer layout broken after last update.
  • Loading branch information
sushmak02 authored Dec 1, 2023
2 parents f758dd5 + dad9a2c commit 795a908
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 18 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
**Requires at least:** 4.4
**Requires PHP:** 5.4
**Tested up to:** 6.4.1
**Stable tag:** 1.6.18
**Stable tag:** 1.6.19
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -140,6 +140,9 @@ This same applies when you are creating your Header/Footer using this plugin.

## Changelog ##

### 1.6.19 ###
- Fix: Header and Footer layout broken after last update.

### 1.6.18 ###
- Improvement: Compatibility with latest Elementor and Elementor Pro 3.18 version.
- Improvement: Compatibility with WordPress VIP Go rules.
Expand Down
4 changes: 2 additions & 2 deletions header-footer-elementor.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* Author URI: https://www.brainstormforce.com/
* Text Domain: header-footer-elementor
* Domain Path: /languages
* Version: 1.6.18
* Version: 1.6.19
* Elementor tested up to: 3.18
* Elementor Pro tested up to: 3.18
*
* @package header-footer-elementor
*/

define( 'HFE_VER', '1.6.18' );
define( 'HFE_VER', '1.6.19' );
define( 'HFE_FILE', __FILE__ );
define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
define( 'HFE_URL', plugins_url( '/', __FILE__ ) );
Expand Down
8 changes: 4 additions & 4 deletions inc/class-header-footer-elementor.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function register_notices() {
'type' => '',
'message' => sprintf(
'<div class="notice-image">
<img src="%1$s" class="custom-logo" alt="Sidebar Manager" itemprop="logo"></div>
<img src="%1$s" class="custom-logo" alt="Sidebar Manager" itemprop="logo"></div>
<div class="notice-content">
<div class="notice-heading">
%2$s
Expand Down Expand Up @@ -508,15 +508,15 @@ public function setup_fallback_support() {
*/
public static function get_header_content() {
$header_content = self::$elementor_instance->frontend->get_builder_content_for_display( get_hfe_header_id() );
echo wp_kses_post( $header_content );
echo $header_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
}

/**
* Prints the Footer content.
*/
public static function get_footer_content() {
echo "<div class='footer-width-fixer'>";
echo wp_kses_post( self::$elementor_instance->frontend->get_builder_content_for_display( get_hfe_footer_id() ) );
echo self::$elementor_instance->frontend->get_builder_content_for_display( get_hfe_footer_id() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo '</div>';
}

Expand All @@ -525,7 +525,7 @@ public static function get_footer_content() {
*/
public static function get_before_footer_content() {
echo "<div class='footer-width-fixer'>";
echo wp_kses_post( self::$elementor_instance->frontend->get_builder_content_for_display( hfe_get_before_footer_id() ) );
echo self::$elementor_instance->frontend->get_builder_content_for_display( hfe_get_before_footer_id() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo '</div>';
}

Expand Down
2 changes: 1 addition & 1 deletion inc/widgets-manager/widgets/class-cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ protected function render() {
<a id="hfe-menu-cart__toggle_button" href="<?php echo esc_url( wc_get_cart_url() ); ?>" class="elementor-button hfe-cart-container">
<?php if ( null !== WC()->cart ) { ?>
<span class="elementor-button-text hfe-subtotal">
<?php echo wp_kses_post( WC()->cart->get_cart_subtotal() ); ?>
<?php echo WC()->cart->get_cart_subtotal(); ?>
</span>
<?php } ?>
<span class="elementor-button-icon" data-counter="<?php echo ( null !== WC()->cart ) ? esc_attr( WC()->cart->get_cart_contents_count() ) : ''; ?>">
Expand Down
4 changes: 2 additions & 2 deletions inc/widgets-manager/widgets/class-navigation-menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -2016,7 +2016,7 @@ protected function render() {
$this->add_render_attribute( 'hfe-nav-menu', 'data-full-width', $settings['full_width_dropdown'] );

?>
<div <?php echo wp_kses_post( $this->get_render_attribute_string( 'hfe-main-menu' ) ); ?>>
<div <?php echo $this->get_render_attribute_string( 'hfe-main-menu' ); ?>>
<div role="button" class="hfe-nav-menu__toggle elementor-clickable">
<span class="screen-reader-text"><?php esc_html_e( 'Menu', 'header-footer-elementor' ); ?></span>
<div class="hfe-nav-menu-icon">
Expand All @@ -2026,7 +2026,7 @@ protected function render() {
?>
</div>
</div>
<nav <?php echo wp_kses_post( $this->get_render_attribute_string( 'hfe-nav-menu' ) ); ?>><?php echo wp_kses_post( $menu_html ); ?></nav>
<nav <?php echo $this->get_render_attribute_string( 'hfe-nav-menu' ); ?>><?php echo $menu_html; ?></nav>
</div>
<?php
}
Expand Down
8 changes: 4 additions & 4 deletions inc/widgets-manager/widgets/class-search-button.php
Original file line number Diff line number Diff line change
Expand Up @@ -982,18 +982,18 @@ protected function render() {
<form class="hfe-search-button-wrapper" role="search" action="<?php echo esc_url( home_url() ); ?>" method="get">
<?php if ( 'icon' === $settings['layout'] ) { ?>
<div class = "hfe-search-icon-toggle">
<input <?php echo wp_kses_post( $this->get_render_attribute_string( 'input' ) ); ?>>
<input <?php echo $this->get_render_attribute_string( 'input' ); ?>>
<i class="fas fa-search" aria-hidden="true"></i>
</div>
<?php } else { ?>
<div <?php echo wp_kses_post( $this->get_render_attribute_string( 'container' ) ); ?>>
<div <?php echo $this->get_render_attribute_string( 'container' ); ?>>
<?php if ( 'text' === $settings['layout'] ) { ?>
<input <?php echo wp_kses_post( $this->get_render_attribute_string( 'input' ) ); ?>>
<input <?php echo $this->get_render_attribute_string( 'input' ); ?>>
<button id="clear" type="reset">
<i class="fas fa-times clearable__clear" aria-hidden="true"></i>
</button>
<?php } else { ?>
<input <?php echo wp_kses_post( $this->get_render_attribute_string( 'input' ) ); ?>>
<input <?php echo $this->get_render_attribute_string( 'input' ); ?>>
<button id="clear-with-button" type="reset">
<i class="fas fa-times" aria-hidden="true"></i>
</button>
Expand Down
2 changes: 1 addition & 1 deletion inc/widgets-manager/widgets/class-site-logo.php
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ protected function render() {
$class = 'elementor-non-clickable';
}
?>
<a data-elementor-open-lightbox="<?php echo esc_attr( $settings['open_lightbox'] ); ?>" class='<?php echo esc_attr( $class ); ?>' <?php echo wp_kses_post( $this->get_render_attribute_string( 'link' ) ); ?>>
<a data-elementor-open-lightbox="<?php echo esc_attr( $settings['open_lightbox'] ); ?>" class='<?php echo esc_attr( $class ); ?>' <?php echo $this->get_render_attribute_string( 'link' ); ?>>
<?php endif; ?>
<?php
if ( empty( $site_image ) ) {
Expand Down
4 changes: 2 additions & 2 deletions languages/header-footer-elementor.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This file is distributed under the same license as the Elementor Header & Footer Builder package.
msgid ""
msgstr ""
"Project-Id-Version: Elementor Header & Footer Builder 1.6.18\n"
"Project-Id-Version: Elementor Header & Footer Builder 1.6.19\n"
"Report-Msgid-Bugs-To: "
"https://wordpress.org/support/plugin/header-footer-elementor\n"
"POT-Creation-Date: 2023-11-30 07:08:53+00:00\n"
"POT-Creation-Date: 2023-12-01 04:05:32+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.18
Stable tag: 1.6.19
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -140,6 +140,9 @@ This same applies when you are creating your Header/Footer using this plugin.

== Changelog ==

= 1.6.19 =
- Fix: Header and Footer layout broken after last update.

= 1.6.18 =
- Improvement: Compatibility with latest Elementor and Elementor Pro 3.18 version.
- Improvement: Compatibility with WordPress VIP Go rules.
Expand Down

0 comments on commit 795a908

Please sign in to comment.