adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating cleanUpFields in 1.2 and 1.2 for #2632

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5204 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-05-27 00:38:10 +00:00
parent ae652431e9
commit 741e77c4b0
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cake/libs/controller/controller.php
View file

@ -589,9 +589,9 @@ class Controller extends Object {
* @return unknown * @return unknown
*/ */
function render($action = null, $layout = null, $file = null) { function render($action = null, $layout = null, $file = null) {
$this->beforeRender(); $this->beforeRender();
$viewClass = $this->view; $viewClass = $this->view;
if ($this->view != 'View') { if ($this->view != 'View') {
$viewClass = $this->view . 'View'; $viewClass = $this->view . 'View';
@ -723,8 +723,8 @@ class Controller extends Object {
break; break;
} }
} }
} }
$fieldNames[$column['name']]['label'] = Inflector::humanize($humanName); $fieldNames[$column['name']]['label'] = Inflector::humanize($humanName);
$fieldNames[$column['name']]['prompt'] = $fieldNames[$column['name']]['label']; $fieldNames[$column['name']]['prompt'] = $fieldNames[$column['name']]['label'];
@ -939,6 +939,9 @@ class Controller extends Object {
if ($_hour != 12 && (isset($this->data[$modelClass][$field['name'] . '_meridian']) && 'pm' == $this->data[$modelClass][$field['name'] . '_meridian'])) { if ($_hour != 12 && (isset($this->data[$modelClass][$field['name'] . '_meridian']) && 'pm' == $this->data[$modelClass][$field['name'] . '_meridian'])) {
$_hour = $_hour + 12; $_hour = $_hour + 12;
} }
if ($hour == 12 && 'am' == $this->data[$modelName][$field['name'] . '_meridian']) {
$hour = '00';
}
unset($this->data[$modelClass][$field['name'] . '_meridian']); unset($this->data[$modelClass][$field['name'] . '_meridian']);
$newDate = null; $newDate = null;