From 34bbeb0d39cedb876267cdd78c8faa2821858aeb Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Fri, 11 Jan 2008 18:35:45 +0000
Subject: [PATCH] fixing cache engine prefix

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6365 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/cache.php                           | 2 +-
 cake/tests/cases/libs/cache/memcache.test.php | 3 ++-
 cake/tests/cases/libs/cache/model.test.php    | 3 ++-
 cake/tests/cases/libs/cache/xcache.test.php   | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 32d9f5212..d84decd4c 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -379,7 +379,7 @@ class CacheEngine extends Object {
  * @access public
  */
 	function init($settings = array()) {
-		$this->settings = array_merge(array('duration'=> 3600, 'probability'=> 100), $settings);
+		$this->settings = array_merge(array('prefix' => 'cake_', 'duration'=> 3600, 'probability'=> 100), $settings);
 		return true;
 	}
 /**
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 6e09269d5..c2ea89366 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -49,7 +49,8 @@ class MemcacheEngineTest extends UnitTestCase {
 
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('duration'=> 3600,
+		$expecting = array('prefix' => 'cake_',
+						'duration'=> 3600,
 						'probability' => 100,
 						'servers' => array('127.0.0.1'),
 						'compress' => false,
diff --git a/cake/tests/cases/libs/cache/model.test.php b/cake/tests/cases/libs/cache/model.test.php
index d942adf6c..ab59d3a87 100644
--- a/cake/tests/cases/libs/cache/model.test.php
+++ b/cake/tests/cases/libs/cache/model.test.php
@@ -63,7 +63,8 @@ class ModelEngineTest extends CakeTestCase {
 
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('duration'=> 3600, //[optional]
+		$expecting = array('prefix' => 'cake_',
+							'duration'=> 3600, //[optional]
 							'probability'=> 100, //[optional]
 							'className' => 'CacheTestModel', //[optional]
 							'fields' => array('data', 'expires'), //[optional]
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 618e096ab..dfb573c7f 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -49,7 +49,8 @@ class XcacheEngineTest extends UnitTestCase {
 
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('duration'=> 3600,
+		$expecting = array('prefix' => 'cake_',
+						'duration'=> 3600,
 						'probability' => 100,
 						'engine' => 'Xcache',
 						'PHP_AUTH_USER' => 'cake',