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

Updating doc block.

Browse source 
Removing redundant condition.
This commit is contained in:
mark_story 2009-10-12 23:38:55 -04:00
parent f59e4013c7
commit e04cc81613
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/model/model.php
View file

@ -985,11 +985,11 @@ class Model extends Overloadable {
} }
/** /**
* Initializes the model for writing a new record, loading the default values * Initializes the model for writing a new record, loading the default values
* for those fields that are not defined in $data. Especially helpful for * for those fields that are not defined in $data, and clearing previous validation errors.
* saving data in loops. * Especially helpful for saving data in loops.
* *
* @param mixed $data Optional data array to assign to the model after it is created. If null or false, * @param mixed $data Optional data array to assign to the model after it is created. If null or false,
* schema data defaults are not merged. * schema data defaults are not merged.
* @param boolean $filterKey If true, overwrites any primary key input with an empty value * @param boolean $filterKey If true, overwrites any primary key input with an empty value
* @return array The current Model::data; after merging $data and/or defaults from database * @return array The current Model::data; after merging $data and/or defaults from database
* @access public * @access public
@ -2656,7 +2656,7 @@ class Model extends Overloadable {
$this->tablePrefix = $db->config['prefix']; $this->tablePrefix = $db->config['prefix'];
} }
if (empty($db) || $db == null || !is_object($db)) { if (empty($db) || !is_object($db)) {
return $this->cakeError('missingConnection', array(array('className' => $this->alias))); return $this->cakeError('missingConnection', array(array('className' => $this->alias)));
} }
} }