Redux Framework - Version 4.1.5

Version Description

  • Fixed: Google fonts not working when old configs used string vs an array for output.
  • Release date: July 30, 2020
Download this release

Release Info

Developer dovyp
Plugin Icon 128x128 Redux Framework
Version 4.1.5
Comparing to
See all releases

Code changes from version 4.1.4 to 4.1.5

Files changed (6) hide show
  1. composer.json +1 -1
  2. readme.txt +5 -2
  3. redux-core/framework.php +1 -1
  4. redux-core/inc/classes/class-redux-output.php +1 -3
  5. redux-core/inc/fields/typography/class-redux-typography.php +9 -7
  6. redux-framework.php +1 -1
composer.json CHANGED
@@ -1,6 +1,6 @@
1
  {
2
  "name": "reduxframework/redux-framework-4",
3
- "version": "4.1.4",
4
  "authors": [
5
  {
6
  "name": "Redux.io",
1
  {
2
  "name": "reduxframework/redux-framework-4",
3
+ "version": "4.1.5",
4
  "authors": [
5
  {
6
  "name": "Redux.io",
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: admin, admin interface, options, theme options, plugin options, options fr
5
  Requires at least: 4.0
6
  Requires PHP: 5.3
7
  Tested up to: 5.5
8
- Stable tag: 4.1.4
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
11
 
@@ -131,11 +131,14 @@ That's because the real FAQ section is on our site! Please visit [http://docs.re
131
 
132
  == Changelog ==
133
 
 
 
 
 
134
  = 4.1.4 =
135
  * Fixed: Google fonts loading over non-secure breaks fonts. Forced all SSL for Google fonts. :)
136
  * Release date: July 30, 2020
137
 
138
-
139
  = 4.1.3 =
140
  * Fixed: Issue where theme devs tried to bypass the framework. Literally I made an empty file to fix their coding. :P
141
  * Release date: July 29, 2020
5
  Requires at least: 4.0
6
  Requires PHP: 5.3
7
  Tested up to: 5.5
8
+ Stable tag: 4.1.5
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
11
 
131
 
132
  == Changelog ==
133
 
134
+ = 4.1.5 =
135
+ * Fixed: Google fonts not working when old configs used string vs an array for output.
136
+ * Release date: July 30, 2020
137
+
138
  = 4.1.4 =
139
  * Fixed: Google fonts loading over non-secure breaks fonts. Forced all SSL for Google fonts. :)
140
  * Release date: July 30, 2020
141
 
 
142
  = 4.1.3 =
143
  * Fixed: Issue where theme devs tried to bypass the framework. Literally I made an empty file to fix their coding. :P
144
  * Release date: July 29, 2020
redux-core/framework.php CHANGED
@@ -23,7 +23,7 @@ defined( 'ABSPATH' ) || exit;
23
 
24
  require_once dirname( __FILE__ ) . '/class-redux-core.php';
25
 
26
- Redux_Core::$version = '4.1.4';
27
  Redux_Core::$redux_path = dirname( __FILE__ );
28
  Redux_Core::instance();
29
 
23
 
24
  require_once dirname( __FILE__ ) . '/class-redux-core.php';
25
 
26
+ Redux_Core::$version = '4.1.5';
27
  Redux_Core::$redux_path = dirname( __FILE__ );
28
  Redux_Core::instance();
29
 
redux-core/inc/classes/class-redux-output.php CHANGED
@@ -209,9 +209,7 @@ if ( ! class_exists( 'Redux_Output', false ) ) {
209
  </script>
210
  <?php
211
  } elseif ( ! $core->args['disable_google_fonts_link'] ) {
212
- $protocol = ( ! empty( Redux_Core::$server['HTTPS'] ) && 'off' !== Redux_Core::$server['HTTPS'] || 443 === Redux_Core::$server['SERVER_PORT'] ) ? 'https:' : 'http:';
213
-
214
- wp_enqueue_style( 'redux-google-fonts-' . $core->args['opt_name'], $protocol . $typography->make_google_web_font_link( $core->typography ), array(), $version, 'all' );
215
  }
216
  }
217
  }
209
  </script>
210
  <?php
211
  } elseif ( ! $core->args['disable_google_fonts_link'] ) {
212
+ wp_enqueue_style( 'redux-google-fonts-' . $core->args['opt_name'], $typography->make_google_web_font_link( $core->typography ), array(), $version, 'all' );
 
 
213
  }
214
  }
215
  }
redux-core/inc/fields/typography/class-redux-typography.php CHANGED
@@ -681,16 +681,10 @@ if ( ! class_exists( 'Redux_Typography', false ) ) {
681
  'subset' => array( $this->value['subsets'] ),
682
  );
683
 
684
- if ( ( ! empty( Redux_Core::$server['HTTPS'] ) && 'off' !== Redux_Core::$server['HTTPS'] || 443 === Redux_Core::$server['SERVER_PORT'] ) ) {
685
- $protocol = 'https:';
686
- } else {
687
- $protocol = 'http:';
688
- }
689
-
690
  wp_deregister_style( 'redux-typography-preview' );
691
  wp_dequeue_style( 'redux-typography-preview' );
692
 
693
- wp_enqueue_style( 'redux-typography-preview', $protocol . $this->make_google_web_font_link( $this->typography_preview ), array(), Redux_Core::$version, 'all' );
694
  }
695
 
696
  $style = 'display: block; font-family: ' . esc_attr( $this->value['font-family'] ) . '; font-weight: ' . esc_attr( $this->value['font-weight'] ) . ';';
@@ -1011,6 +1005,10 @@ if ( ! class_exists( 'Redux_Typography', false ) ) {
1011
  $font = $this->value;
1012
 
1013
  if ( '' !== $style ) {
 
 
 
 
1014
  if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
1015
  $keys = implode( ',', $this->field['output'] );
1016
  $this->parent->outputCSS .= $keys . '{' . $style . '}';
@@ -1038,6 +1036,10 @@ if ( ! class_exists( 'Redux_Typography', false ) ) {
1038
  }
1039
  }
1040
 
 
 
 
 
1041
  if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
1042
  $keys = implode( ',', $this->field['compiler'] );
1043
  $this->parent->compilerCSS .= $keys . '{' . $style . '}';
681
  'subset' => array( $this->value['subsets'] ),
682
  );
683
 
 
 
 
 
 
 
684
  wp_deregister_style( 'redux-typography-preview' );
685
  wp_dequeue_style( 'redux-typography-preview' );
686
 
687
+ wp_enqueue_style( 'redux-typography-preview', $this->make_google_web_font_link( $this->typography_preview ), array(), Redux_Core::$version, 'all' );
688
  }
689
 
690
  $style = 'display: block; font-family: ' . esc_attr( $this->value['font-family'] ) . '; font-weight: ' . esc_attr( $this->value['font-weight'] ) . ';';
1005
  $font = $this->value;
1006
 
1007
  if ( '' !== $style ) {
1008
+ if ( ! empty( $field['output'] ) && ! is_array( $field['output'] ) ) {
1009
+ $field['output'] = array( $field['output'] );
1010
+ }
1011
+
1012
  if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
1013
  $keys = implode( ',', $this->field['output'] );
1014
  $this->parent->outputCSS .= $keys . '{' . $style . '}';
1036
  }
1037
  }
1038
 
1039
+ if ( ! empty( $field['compiler'] ) && ! is_array( $field['compiler'] ) ) {
1040
+ $field['compiler'] = array( $field['compiler'] );
1041
+ }
1042
+
1043
  if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
1044
  $keys = implode( ',', $this->field['compiler'] );
1045
  $this->parent->compilerCSS .= $keys . '{' . $style . '}';
redux-framework.php CHANGED
@@ -10,7 +10,7 @@
10
  * Description: Build better sites in WordPress fast
11
  * Author: Redux.io + Dovy Paukstys
12
  * Author URI: http://redux.io
13
- * Version: 4.1.4
14
  * Text Domain: redux-framework
15
  * License: GPLv3 or later
16
  * License URI: http://www.gnu.org/licenses/gpl-3.0.txt
10
  * Description: Build better sites in WordPress fast
11
  * Author: Redux.io + Dovy Paukstys
12
  * Author URI: http://redux.io
13
+ * Version: 4.1.5
14
  * Text Domain: redux-framework
15
  * License: GPLv3 or later
16
  * License URI: http://www.gnu.org/licenses/gpl-3.0.txt