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

Merging fixes from 1.2.x.x into 1.1.x.x and vice versa.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3788 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-11-01 07:15:44 +00:00
parent d6b2545628
commit 9bc506b058
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ class Controller extends Object {
* *
* @var string * @var string
*/ */
var $layoutPath = ''; var $layoutPath = null;
/** /**
* Variables for the view * Variables for the view
* *
@ -623,7 +623,6 @@ class Controller extends Object {
$model = $this->modelClass; $model = $this->modelClass;
$modelKey = $this->modelKey; $modelKey = $this->modelKey;
$table = $this->{$model}->table; $table = $this->{$model}->table;
//$association = array_search($table, $this->{$model}->alias);
$objRegistryModel =& ClassRegistry::getObject($modelKey); $objRegistryModel =& ClassRegistry::getObject($modelKey);
foreach($objRegistryModel->_tableInfo as $tables) { foreach($objRegistryModel->_tableInfo as $tables) {
@ -637,7 +636,6 @@ class Controller extends Object {
} }
$fkNames = $this->{$model}->keyToTable[$tabl['name']]; $fkNames = $this->{$model}->keyToTable[$tabl['name']];
$fieldNames[$tabl['name']]['table'] = $fkNames[0]; $fieldNames[$tabl['name']]['table'] = $fkNames[0];
//$association = array_search($fieldNames[$tabl['name']]['table'], $this->{$model}->alias);
$fieldNames[$tabl['name']]['prompt'] = Inflector::humanize($niceName); $fieldNames[$tabl['name']]['prompt'] = Inflector::humanize($niceName);
$fieldNames[$tabl['name']]['model'] = $fkNames[1]; $fieldNames[$tabl['name']]['model'] = $fkNames[1];
$fieldNames[$tabl['name']]['modelKey'] = $this->{$model}->tableToModel[$fieldNames[$tabl['name']]['table']]; $fieldNames[$tabl['name']]['modelKey'] = $this->{$model}->tableToModel[$fieldNames[$tabl['name']]['table']];
@ -749,6 +747,7 @@ class Controller extends Object {
case "date": case "date":
case "datetime": case "datetime":
case "time": case "time":
case "year":
if (0 != strncmp("created", $tabl['name'], 7) && 0 != strncmp("modified", $tabl['name'], 8)) { if (0 != strncmp("created", $tabl['name'], 7) && 0 != strncmp("modified", $tabl['name'], 8)) {
$fieldNames[$tabl['name']]['type'] = $type; $fieldNames[$tabl['name']]['type'] = $type;
} }