Skip to content

Pro issue 5296 / stop decoding default values for non-array types #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 3 commits into from
Nov 19, 2024
Merged

Pro issue 5296 / stop decoding default values for non-array types #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d5991b
Pro issue 5296 / stop decoding default values for non-array types
Crabcyborg Nov 19, 2024
dd28917
Add another check
Crabcyborg Nov 19, 2024
a1ff2c7
Clean up
Crabcyborg Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions classes/models/FrmField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,9 +1084,14 @@ private static function prepare_options( &$results ) {

// Allow a single box to be checked for the default value.
$before = $results->default_value;
FrmAppHelper::unserialize_or_decode( $results->default_value );
if ( $before === $results->default_value && ! is_array( $before ) && strpos( $before, '["' ) === 0 ) {
$results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value );

$field_object = FrmFieldFactory::get_field_type( $results->type );

if ( $field_object->should_unserialize_value() ) {
FrmAppHelper::unserialize_or_decode( $results->default_value );
if ( $before === $results->default_value && ! is_array( $before ) && strpos( $before, '["' ) === 0 ) {
$results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value );
}
}
}

Expand Down
17 changes: 14 additions & 3 deletions classes/models/fields/FrmFieldType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ protected function include_on_form_builder( $name, $field ) {
$html_id = $this->html_id();
$read_only = isset( $field['read_only'] ) ? $field['read_only'] : 0;

$field['html_name'] = $field_name;
$field['html_id'] = $html_id;
FrmAppHelper::unserialize_or_decode( $field['default_value'] );
$field['html_name'] = $field_name;
$field['html_id'] = $html_id;
$field['default_value'] = $this->maybe_decode_value( $field['default_value'] );

$display = $this->display_field_settings();
include $this->include_form_builder_file();
Expand Down Expand Up @@ -1654,6 +1654,17 @@ public function maybe_decode_value( $value ) {
return $value;
}

/**
* Only some field types should unserialize or decode values. This is based on the value of the array_allowed property.
*
* @since x.x
*
* @return bool
*/
public function should_unserialize_value() {
return $this->array_allowed;
}

/**
* This function is deprecated since it has a typo in the name.
*
Expand Down