adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging fixes and enhancements into trunk

Browse source 
Revision: [1848]
Fixing references.

Revision: [1847]
Adding fix for errors when using scaffold.
On some version of PHP 4 some people where getting Call to member function on non-object...
in Controller::generateFieldNames() at line 494.

Fixed call to get_class_methods that was using the name of the class and not the instance of the class,
this would cause a Wrong datatype for second argument...


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1849 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-01-20 18:43:05 +00:00
parent c56189ac5c
commit 2407160dc5
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.7.1846 RC 2 0.10.7.1849 RC 2

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

@ -484,7 +484,7 @@ class Controller extends Object
$modelKey = $this->modelKey; $modelKey = $this->modelKey;
$table = $this->{$model}->table; $table = $this->{$model}->table;
$association = array_search($table,$this->{$model}->alias); $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)
{ {
@ -548,7 +548,7 @@ class Controller extends Object
{ {
$fieldNames[ $tabl['name']]['type'] = 'select'; $fieldNames[ $tabl['name']]['type'] = 'select';
$fieldNames[ $tabl['name']]['options'] = array(); $fieldNames[ $tabl['name']]['options'] = array();
$otherModel = ClassRegistry::getObject(Inflector::underscore($fieldNames[$tabl['name']]['modelKey'])); $otherModel =& ClassRegistry::getObject(Inflector::underscore($fieldNames[$tabl['name']]['modelKey']));
if (is_object($otherModel)) if (is_object($otherModel))
{ {
if ($doCreateOptions) if ($doCreateOptions)
@ -600,7 +600,7 @@ class Controller extends Object
{ {
$fieldNames[ $tabl['name']]['type'] = 'select'; $fieldNames[ $tabl['name']]['type'] = 'select';
$fieldNames[ $tabl['name']]['options'] = array(); $fieldNames[ $tabl['name']]['options'] = array();
$otherModel = ClassRegistry::getObject(Inflector::underscore($fieldNames[$tabl['name']]['modelKey'])); $otherModel =& ClassRegistry::getObject(Inflector::underscore($fieldNames[$tabl['name']]['modelKey']));
if( is_object($otherModel) ) if( is_object($otherModel) )
{ {
if( $doCreateOptions ) if( $doCreateOptions )

6
cake/libs/model/model_php4.php
View file

@ -323,7 +323,7 @@ class Model extends Object
} }
} }
if (in_array('settableprefix', get_class_methods($this->name))) if (in_array('settableprefix', get_class_methods($this)))
{ {
$this->setTablePrefix(); $this->setTablePrefix();
} }
@ -429,11 +429,11 @@ class Model extends Object
$colKey = Inflector::underscore($className); $colKey = Inflector::underscore($className);
if(ClassRegistry::isKeySet($colKey)) if(ClassRegistry::isKeySet($colKey))
{ {
$this->{$className} = ClassRegistry::getObject($colKey); $this->{$className} =& ClassRegistry::getObject($colKey);
} }
else else
{ {
$this->{$className} = new $className(); $this->{$className} =& new $className();
} }
$this->alias[$assoc] = $this->{$className}->table; $this->alias[$assoc] = $this->{$className}->table;

2
cake/libs/model/model_php5.php
View file

@ -323,7 +323,7 @@ class Model extends Object
} }
} }
if (in_array('settableprefix', get_class_methods($this->name))) if (in_array('settableprefix', get_class_methods($this)))
{ {
$this->setTablePrefix(); $this->setTablePrefix();
} }

2
cake/libs/view/templates/scaffolds/list.thtml
View file

@ -62,7 +62,7 @@
// this is a foreign key, figure out what the display field should be for this model. // this is a foreign key, figure out what the display field should be for this model.
$otherModelKey = Inflector::underscore($value['modelKey']); $otherModelKey = Inflector::underscore($value['modelKey']);
$otherControllerName = $value['controller']; $otherControllerName = $value['controller'];
$otherModelObject = ClassRegistry::getObject( $otherModelKey ); $otherModelObject =& ClassRegistry::getObject( $otherModelKey );
$alias = array_search($value['table'],$this->controller->{$model}->alias); $alias = array_search($value['table'],$this->controller->{$model}->alias);
if( is_object($otherModelObject) ) if( is_object($otherModelObject) )
{ {

4
cake/libs/view/templates/scaffolds/show.thtml
View file

@ -30,7 +30,7 @@
<?php <?php
$modelName = Inflector::singularize($this->name); $modelName = Inflector::singularize($this->name);
$modelKey = Inflector::underscore($modelName); $modelKey = Inflector::underscore($modelName);
$objModel = ClassRegistry::getObject($modelKey); $objModel =& ClassRegistry::getObject($modelKey);
?> ?>
<h1>Show <?php echo Inflector::humanize($modelName)?></h1> <h1>Show <?php echo Inflector::humanize($modelName)?></h1>
@ -42,7 +42,7 @@
if(isset($value['foreignKey'])) if(isset($value['foreignKey']))
{ {
$alias = array_search($value['table'],$objModel->alias); $alias = array_search($value['table'],$objModel->alias);
$otherModelObject = ClassRegistry::getObject(Inflector::underscore($objModel->tableToModel[$value['table']])); $otherModelObject =& ClassRegistry::getObject(Inflector::underscore($objModel->tableToModel[$value['table']]));
$displayField = $otherModelObject->getDisplayField(); $displayField = $otherModelObject->getDisplayField();
$displayText = $data[$alias][$displayField]; $displayText = $data[$alias][$displayField];