adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

BC fixes for habtm. Closes #3545.

Browse source 
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
This commit is contained in:
euromark 2013-01-30 13:54:09 +01:00 committed by Rachman Chavik
parent 0a96e200a6
commit d504642c9b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -4056,7 +4056,7 @@ class FormHelperTest extends CakeTestCase {
'Contact' => array(),
'ContactTag' => array(
array(
'id' => 1,
'id' => '1',
'name' => 'blue'
),
array(

3
lib/Cake/View/Helper/FormHelper.php
View file

@ -2475,9 +2475,10 @@ class FormHelper extends AppHelper {
}
if ($name !== null) {
$isNumeric = is_numeric($name);
if (
(!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
($selectedIsArray && in_array($name, $attributes['value'], true))
($selectedIsArray && in_array($name, $attributes['value'], !$isNumeric))
) {
if ($attributes['style'] === 'checkbox') {
$htmlOptions['checked'] = true;