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

updating scope in Helper::setEntity()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5981 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-11-12 00:57:38 +00:00
parent 25252e678a
commit 6c0e70faa5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/view/helper.php
View file

@ -329,11 +329,11 @@ class Helper extends Overloadable {
$parts = preg_split('/\/|\./', $entity);
if($parts[0] !== $view->model) {
$sameScope = true;
if (ClassRegistry::isKeySet($view->model)) {
$modelObj =& ClassRegistry::getObject($view->model);
for ($i = 0; $i < count($parts); $i++) {
if ($modelObj->hasField($parts[$i]) || array_key_exists($parts[$i], $modelObj->validate)) {
$sameScope = true;
$hasField = $i;
break;
}
@ -342,10 +342,10 @@ class Helper extends Overloadable {
}
if (ClassRegistry::isKeySet($parts[0])) {
$sameScope = false;
$newModelObj =& ClassRegistry::getObject($parts[0]);
for ($i = 1; $i < count($parts); $i++) {
if ($newModelObj->hasField($parts[$i]) || array_key_exists($parts[$i], $newModelObj->validate)) {
$sameScope = false;
$hasField = $i;
break;
}

4
cake/libs/view/helpers/form.php
View file

@ -134,7 +134,7 @@ class FormHelper extends AppHelper {
'validates' => (ife(empty($object->validate), array(), array_keys($object->validate)))
);
}
if (isset($this->data[$model]) && isset($this->data[$model][$data['key']]) && !empty($this->data[$model][$data['key']])) {
$created = true;
$id = $this->data[$model][$data['key']];
@ -512,7 +512,7 @@ class FormHelper extends AppHelper {
}
}
}
if ($this->model() === $this->field()) {
$options['type'] = 'select';
$options['multiple'] = 'multiple';