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

Adding database prefix check in Model::setDataSource()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6501 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-03-01 20:30:01 +00:00
parent 5ce4469867
commit 9fbf783286
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2384,10 +2384,10 @@ class Model extends Overloadable {
$this->useDbConfig = $dataSource; $this->useDbConfig = $dataSource;
} }
$db =& ConnectionManager::getDataSource($this->useDbConfig); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if (!empty($oldConfig) && isset($oldDb->config['prefix']) && isset($db->config['prefix'])) { if (!empty($oldConfig) && isset($db->config['prefix'])) {
$oldDb =& ConnectionManager::getDataSource($oldConfig); $oldDb =& ConnectionManager::getDataSource($oldConfig);
if (empty($this->tablePrefix) || ($this->tablePrefix == $oldDb->config['prefix'])) { if (empty($this->tablePrefix) || (!isset($oldDb->config['prefix']) || $this->tablePrefix == $oldDb->config['prefix'])) {
$this->tablePrefix = $db->config['prefix']; $this->tablePrefix = $db->config['prefix'];
} }
} elseif (isset($db->config['prefix'])) { } elseif (isset($db->config['prefix'])) {