adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 11:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.1

Browse source 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
This commit is contained in:
mark_story 2011-12-29 20:03:42 -05:00
commit 23178df504
16 changed files with 546 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Cake/Model/Model.php
View file

@ -1203,7 +1203,17 @@ class Model extends Object implements CakeEventListener {
$timeFields = array('H' => 'hour', 'i' => 'min', 's' => 'sec');
$date = array();
if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] != 12 && 'pm' == $data['meridian']) {
if (isset($data['meridian']) && empty($data['meridian'])) {
return null;
}
if (
isset($data['hour']) &&
isset($data['meridian']) &&
!empty($data['hour']) &&
$data['hour'] != 12 &&
'pm' == $data['meridian']
) {
$data['hour'] = $data['hour'] + 12;
}
if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] == 12 && 'am' == $data['meridian']) {
@ -1213,9 +1223,7 @@ class Model extends Object implements CakeEventListener {
foreach ($timeFields as $key => $val) {
if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
$data[$val] = '00';
} elseif ($data[$val] === '') {
$data[$val] = '';
} else {
} elseif ($data[$val] !== '') {
$data[$val] = sprintf('%02d', $data[$val]);
}
if (!empty($data[$val])) {