From ba6ad9d3c1353aa4f3a96379c6211e1b690decd5 Mon Sep 17 00:00:00 2001 From: phpnut Date: Thu, 1 Feb 2007 05:18:25 +0000 Subject: [PATCH] Adding fix for #1965 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4382 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 2c2f860b7..681f2c609 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -1905,7 +1905,7 @@ class Model extends Overloadable { $db =& ConnectionManager::getDataSource($this->useDbConfig); - if (isset($db->config['prefix'])) { + if (!empty($db->config['prefix']) && $this->tablePrefix == null) { $this->tablePrefix = $db->config['prefix']; }