adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-20 16:39:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging fixes to the trunk,

Browse source 
re syncing sandboxes

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@875 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-09-17 22:20:28 +00:00
parent 00aa3c66d2
commit 02f5dfb43f
2 changed files with 12 additions and 4 deletions

6
libs/helpers/html.php
View file

@ -265,7 +265,7 @@ class HtmlHelper extends Helper
} }
return $this->output(sprintf($this->tags['password'], $this->model, $this->field, return $this->output(sprintf($this->tags['password'], $this->model, $this->field,
$this->_parseAttributes($htmlAttributes, null, '', ' ')), $return); $this->_parseAttributes($htmlAttributes, null, ' ', ' ')), $return);
} }
@ -321,7 +321,7 @@ class HtmlHelper extends Helper
$this->tagValue($fieldName)? $htmlAttributes['checked'] = 'checked': null; $this->tagValue($fieldName)? $htmlAttributes['checked'] = 'checked': null;
$title = $title? $title: ucfirst($fieldName); $title = $title? $title: ucfirst($fieldName);
return $this->output(sprintf($this->tags['checkbox'], $this->model, $this->field, return $this->output(sprintf($this->tags['checkbox'], $this->model, $this->field,
$this->field, $this->field, $this->field,
$this->_parseAttributes($htmlAttributes, null, '', ' '), $title), $return); $this->_parseAttributes($htmlAttributes, null, '', ' '), $title), $return);
} }
@ -454,7 +454,7 @@ class HtmlHelper extends Helper
} }
return $this->output(sprintf($this->tags['input'], $this->model, $this->field, return $this->output(sprintf($this->tags['input'], $this->model, $this->field,
$this->_parseAttributes($htmlAttributes, null, '', ' ')), $return); $this->_parseAttributes($htmlAttributes, null, ' ', ' ')), $return);
} }
/** /**

10
libs/model.php
View file

@ -758,7 +758,7 @@ class Model extends Object
{ {
if (!in_array(strtolower($table_name), $this->db->tables())) if (!in_array(strtolower($table_name), $this->db->tables()))
{ {
$this->_throwMissingModel($table_name); $this->_throwMissingTable($table_name);
die(); die();
} }
else else
@ -1331,6 +1331,10 @@ class Model extends Object
{ {
$newValue[$i] = $original[$i]; $newValue[$i] = $original[$i];
} }
if(count($this->_oneToMany < 2))
{
$newValue = $newValue2;
}
} }
elseif(!empty($original)) elseif(!empty($original))
{ {
@ -1399,6 +1403,10 @@ class Model extends Object
{ {
$newValue2[$i] = $original[$i]; $newValue2[$i] = $original[$i];
} }
if(count($this->_manyToMany < 2))
{
$newValue = $newValue2;
}
} }
elseif(!empty($original)) elseif(!empty($original))
{ {