Skip to content

Commit 6ddeec9

Browse files
committed
Return mismatch in Redux Helpers. Ver bump.
Signed-off-by: Kevin Provance <[email protected]>
1 parent 455c198 commit 6ddeec9

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Redux Changelog
22

3+
## 4.2.5
4+
* Fixed: Type mismatch in Redux Helpers.
5+
36
## 4.2.4
47
* Fixed: Taxonomy WordPress data not handled properly in fields that support WordPress data.
58

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "gulpfile.js",
44
"name": "redux",
55
"author": "Redux.io",
6-
"version": "4.2.4",
6+
"version": "4.2.5",
77
"license": "GPL-3.0-or-later",
88
"repository": {
99
"type": "git",

readme.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: gutenberg, blocks, gutenberg blocks, editor, block, page builder, block ed
44
Requires at least: 4.0
55
Requires PHP: 7.1
66
Tested up to: 5.8
7-
Stable tag: 4.2.4
7+
Stable tag: 4.2.5
88
License: GPL-3.0+
99
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
1010

@@ -152,7 +152,10 @@ If you want, you can use the [Gutenberg](https://wordpress.org/plugins/gutenberg
152152

153153
== Changelog ==
154154

155-
- 4.2.4 =
155+
= 4.2.5 =
156+
Fixed: Type mismatch in Redux Helpers.
157+
158+
= 4.2.4 =
156159
Fixed: Taxonomy WordPress data not handled properly in fields that support WordPress data.
157160

158161
= 4.2.3 =

redux-core/framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
require_once dirname( __FILE__ ) . '/class-redux-core.php';
2525

26-
Redux_Core::$version = '4.2.4';
26+
Redux_Core::$version = '4.2.5';
2727
Redux_Core::$redux_path = dirname( __FILE__ );
2828
Redux_Core::instance();
2929

redux-core/inc/classes/class-redux-helpers.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -907,10 +907,11 @@ public static function hex2rgba( string $hex, string $alpha = '' ): string {
907907
*
908908
* @param mixed $var String to convert to true boolean.
909909
*
910-
* @return string::make_bool_str( $var )
910+
* @return mixed|array
911+
*
911912
* @deprecated No longer using camelCase naming convention.
912913
*/
913-
public static function makeBoolStr( $var ): string { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
914+
public static function makeBoolStr( $var ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
914915
_deprecated_function( __CLASS__ . '::' . __FUNCTION__, 'Redux 4.0.0', 'Redux_Instances::make_bool_str( $var )' );
915916

916917
return self::make_bool_str( $var );
@@ -921,9 +922,9 @@ public static function makeBoolStr( $var ): string { // phpcs:ignore WordPress.N
921922
*
922923
* @param mixed $var true|false to convert.
923924
*
924-
* @return string
925+
* @return mixed|array
925926
*/
926-
public static function make_bool_str( $var ): string {
927+
public static function make_bool_str( $var ) {
927928
if ( false === $var || 'false' === $var || 0 === $var || '0' === $var || '' === $var || empty( $var ) ) {
928929
return 'false';
929930
} elseif ( true === $var || 'true' === $var || 1 === $var || '1' === $var ) {

redux-framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Description: Build better sites in WordPress fast
1111
* Author: Redux.io
1212
* Author URI: http://redux.io
13-
* Version: 4.2.4
13+
* Version: 4.2.5
1414
* Text Domain: redux-framework
1515
* License: GPLv3 or later
1616
* License URI: http://www.gnu.org/licenses/gpl-3.0.txt

sample/sections/select-fields/select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
array(
134134
'id' => 'opt-multi-select-tags',
135135
'type' => 'select',
136-
'data' => 'tags',
136+
'data' => 'terms',
137137
'multi' => true,
138138
'title' => esc_html__( 'Tags Multi Select Option', 'your-textdomain-here' ),
139139
'subtitle' => esc_html__( 'No validation can be done on this field type', 'your-textdomain-here' ),

0 commit comments

Comments
 (0)