mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 02:56:15 +00:00
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:
parent
32f9e1e0e5
commit
4babd8b9c2
3 changed files with 1765 additions and 21 deletions
|
@ -6,4 +6,4 @@
|
||||||
// +---------------------------------------------------------------------------------------------------+ //
|
// +---------------------------------------------------------------------------------------------------+ //
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
1.0.0.25285
|
1.0.0.2530
|
|
@ -1628,7 +1628,6 @@ class Model extends Object
|
||||||
*/
|
*/
|
||||||
function setDataSource($dataSource = null)
|
function setDataSource($dataSource = null)
|
||||||
{
|
{
|
||||||
$db =& ConnectionManager::getDataSource($this->useDbConfig);
|
|
||||||
if ($dataSource == null)
|
if ($dataSource == null)
|
||||||
{
|
{
|
||||||
$dataSource = $this->useDbConfig;
|
$dataSource = $this->useDbConfig;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue