Merging changes to model_php4.php

Merging changes to bake.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2530 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-04-24 16:38:16 +00:00
parent 32f9e1e0e5
commit 4babd8b9c2
3 changed files with 1765 additions and 21 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.0.0.25285
1.0.0.2530

View file

@ -1628,7 +1628,6 @@ class Model extends Object
*/
function setDataSource($dataSource = null)
{
$db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($dataSource == null)
{
$dataSource = $this->useDbConfig;

File diff suppressed because it is too large Load diff