Fixing some issues in ACL related classes when using database prefixes

cakephp · Feb 23, 2011 · 00f3aaf · 00f3aaf
1 parent 8f62d01
commit 00f3aaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
@@ -67,7 +67,7 @@ function __construct() {
  * @return array Node found in database
  */
 	public function node($ref = null) {
-		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		$db = $this->getDataSource();
 		$type = $this->alias;
 		$result = null;
 

diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
@@ -363,8 +363,8 @@ function testNodeObjectFind() {
  * @return void
  */
 	function testNodeAliasParenting() {
-		$Aco = new DbAcoTest();
-		$db = ConnectionManager::getDataSource('test');
+		$Aco = ClassRegistry::init('DbAcoTest');
+		$db = $Aco->getDataSource();
 		$db->truncate($Aco);
 
 		$Aco->create(array('model' => null, 'foreign_key' => null, 'parent_id' => null, 'alias' => 'Application'));