malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix set_checkbox() and set_radio() default checked. Fixes #3228

Browse Source
This commit is contained in:
michalsn 2020-07-05 09:21:34 +02:00
parent bbf57413a4
commit 3cccf2146a
No known key found for this signature in database
GPG Key ID: 0E4DB53924E59366
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/Helpers/form_helper.php
View File

@ -843,7 +843,7 @@ if (! function_exists('set_checkbox'))
}
// Unchecked checkbox and radio inputs are not even submitted by browsers ...
if (intval($input) === 0 || ! empty($request->getPost()) || ! empty(old($field)))
if ((string) $input === '0' || ! empty($request->getPost()) || ! empty(old($field)))
{
return ($input === $value) ? ' checked="checked"' : '';
}
@ -895,7 +895,7 @@ if (! function_exists('set_radio'))
// Unchecked checkbox and radio inputs are not even submitted by browsers ...
$result = '';
if (intval($input) === 0 || ! empty($input = $request->getPost($field)) || ! empty($input = old($field)))
if ((string) $input === '0' || ! empty($input = $request->getPost($field)) || ! empty($input = old($field)))
{
$result = ($input === $value) ? ' checked="checked"' : '';
}

10
tests/system/Helpers/FormHelperTest.php
View File

@ -745,6 +745,9 @@ EOH;
$_SESSION = [];
$this->assertEquals('', set_checkbox('foo', 'bar'));
$_SESSION = [];
$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar', true));
}
// ------------------------------------------------------------------------
@ -772,6 +775,9 @@ EOH;
$_SESSION = [];
$this->assertEquals('', set_checkbox('foo', 'bar'));
$_SESSION = [];
$this->assertEquals(' checked="checked"', set_checkbox('foo', '0', true));
}
// ------------------------------------------------------------------------
@ -803,6 +809,7 @@ EOH;
$_POST['bar'] = 'baz';
$this->assertEquals(' checked="checked"', set_radio('bar', 'baz'));
$this->assertEquals('', set_radio('bar', 'boop'));
$this->assertEquals(' checked="checked"', set_radio('bar', 'boop', true));
}
/**
@ -814,6 +821,9 @@ EOH;
$_POST['bar'] = 0;
$this->assertEquals(' checked="checked"', set_radio('bar', '0'));
$this->assertEquals('', set_radio('bar', 'boop'));
$_POST = [];
$this->assertEquals(' checked="checked"', set_radio('bar', '0', true));
}
public function testSetRadioFromPostArray()