Skip to content

Commit 0c62d90

Browse files
authored
Merge pull request #65 from Nikschavan/fix-cache-issues
v1.1.7
2 parents b208952 + 045cf1b commit 0c62d90

File tree

5 files changed

+24
-33
lines changed

5 files changed

+24
-33
lines changed

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
**Tags:** beaver builder header footer, beaver builder modules, customize header, beaver builder addon, beaver builder, beaver builder extensions, beaver addons, beaver builder free, page builder addons, beaver builder template, beaver builder header, customize footer
44
**Donate link:** https://www.paypal.me/BrainstormForce
55
**Requires at least:** 3.6
6-
**Tested up to:** 4.8.0
7-
**Stable tag:** 1.1.5
6+
**Tested up to:** 4.9.1
7+
**Stable tag:** 1.1.7
88
**License:** GPLv2 or later
99
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
1010

@@ -93,7 +93,11 @@ href=”https://www.brainstormforce.com/go/brainstorm-force-twitter-page/?utm_so
9393

9494
## Changelog ##
9595

96-
### 1.1.6 (unreleased) ###
96+
### 1.1.7 ###
97+
- Fix: Beaver Builder layout cache missing some of the static CSS and JS files.
98+
- Fix: When editing the header / footer the layout was being duplicated.
99+
100+
### 1.1.6 ###
97101
- Fix: Menu module could not highlight the current menu item in the header template.
98102
- Improvement: Load the Header and Footer JS in the `wp_qneueue_script`. earlier this was loaded right where the shortcode is added.
99103
- Allow the plugin settings to be changed from child theme functions, This allows disabling and changing headers and footer per page from code.

bb-header-footer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Author URI: https://www.brainstormforce.com/
88
* Text Domain: bb-header-footer
99
* Domain Path: /languages
10-
* Version: 1.1.6
10+
* Version: 1.1.7
1111
*
1212
* @package BB_Header_Footer
1313
*/
@@ -17,7 +17,7 @@
1717
*/
1818
require_once 'class-bb-header-footer.php';
1919

20-
define( 'BBHF_VER', '1.1.6' );
20+
define( 'BBHF_VER', '1.1.7' );
2121
define( 'BBHF_DIR', plugin_dir_path( __FILE__ ) );
2222
define( 'BBHF_URL', plugins_url( '/', __FILE__ ) );
2323
define( 'BBHF_PATH', plugin_basename( __FILE__ ) );

class-bb-header-footer.php

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function __construct() {
2424

2525
$this->template = get_template();
2626

27-
if ( class_exists( 'FLBuilder' ) ) {
27+
if ( class_exists( 'FLBuilder' ) && is_callable( 'FLBuilderShortcodes::insert_layout' ) ) {
2828

2929
$this->includes();
3030
$this->load_textdomain();
@@ -111,17 +111,6 @@ public function enqueue_scripts() {
111111
wp_enqueue_style( 'bbhf-style', BBHF_URL . 'assets/css/bb-header-footer.css', array(), BBHF_VER );
112112
wp_register_script( 'bb-header-footer', BBHF_URL . 'assets/js/bb-header-footer.js', array( 'jquery' ), BBHF_VER, true );
113113
wp_enqueue_script( 'bb-header-footer' );
114-
115-
$header_id = BB_Header_Footer::get_settings( 'bb_header_id', '' );
116-
$footer_id = BB_Header_Footer::get_settings( 'bb_footer_id', '' );
117-
118-
if ( '' !== $header_id && is_callable( 'FLBuilder::enqueue_layout_styles_scripts_by_id' ) ) {
119-
FLBuilder::enqueue_layout_styles_scripts_by_id( $header_id );
120-
}
121-
122-
if ( '' !== $footer_id && is_callable( 'FLBuilder::enqueue_layout_styles_scripts_by_id' ) ) {
123-
FLBuilder::enqueue_layout_styles_scripts_by_id( $footer_id );
124-
}
125114
}
126115

127116
/**
@@ -217,17 +206,11 @@ public static function get_footer_content() {
217206
* @return String Rendered markup of the layout
218207
*/
219208
public static function render_bb_layout( $post_id ) {
220-
if ( is_callable( 'FLBuilder::render_content_by_id' ) ) {
221-
222-
return FLBuilder::render_content_by_id( $post_id );
223-
} elseif ( is_callable( 'FLBuilderShortcodes::insert_layout' ) ) {
224-
225-
return FLBuilderShortcodes::insert_layout(
226-
array(
227-
'id' => $post_id,
228-
)
229-
);
230-
}
209+
return FLBuilderShortcodes::insert_layout(
210+
array(
211+
'id' => $post_id,
212+
)
213+
);
231214
}
232215

233216
/**

languages/bb-header-footer.pot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the same license as the Beaver Builder Header Footer package.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Beaver Builder Header Footer 1.1.6-beta.2\n"
5+
"Project-Id-Version: Beaver Builder Header Footer 1.1.6\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/bb-header-footer\n"
7-
"POT-Creation-Date: 2017-10-13 07:02:34+00:00\n"
7+
"POT-Creation-Date: 2017-12-11 11:49:28+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -91,7 +91,7 @@ msgid ""
9191
"activated."
9292
msgstr ""
9393

94-
#: class-bb-header-footer.php:172
94+
#: class-bb-header-footer.php:161
9595
msgid ""
9696
"Hey, your current theme is not supported by BB Header Footer, click <a "
9797
"href=\"https://github.com/Nikschavan/bb-header-footer#which-themes-are-"

readme.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Contributors: brainstormforce, Nikschavan
33
Tags: beaver builder header footer, beaver builder modules, customize header, beaver builder addon, beaver builder, beaver builder extensions, beaver addons, beaver builder free, page builder addons, beaver builder template, beaver builder header, customize footer
44
Donate link: https://www.paypal.me/BrainstormForce
55
Requires at least: 3.6
6-
Tested up to: 4.8.2
7-
Stable tag: 1.1.6
6+
Tested up to: 4.9.1
7+
Stable tag: 1.1.7
88
License: GPLv2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010

@@ -93,6 +93,10 @@ href=”https://www.brainstormforce.com/go/brainstorm-force-twitter-page/?utm_so
9393

9494
== Changelog ==
9595

96+
= 1.1.7 =
97+
- Fix: Beaver Builder layout cache missing some of the static CSS and JS files.
98+
- Fix: When editing the header / footer the layout was being duplicated.
99+
96100
= 1.1.6 =
97101
- Fix: Menu module could not highlight the current menu item in the header template.
98102
- Improvement: Load the Header and Footer JS in the `wp_qneueue_script`. earlier this was loaded right where the shortcode is added.

0 commit comments

Comments
 (0)