From cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 20 Jan 2009 16:54:15 +0000
Subject: i am not sure if people will like the config layout i test here... it
 requires the framework at least being present

git-svn-id: file:///svn/phpbb/trunk@9281 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acm/bootstrap.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes/acm/bootstrap.php')

diff --git a/phpBB/includes/acm/bootstrap.php b/phpBB/includes/acm/bootstrap.php
index 849f3e3863..ea671706e5 100644
--- a/phpBB/includes/acm/bootstrap.php
+++ b/phpBB/includes/acm/bootstrap.php
@@ -16,15 +16,6 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-/**
-* Define missing ACM config variable... if not initialized yet
-* @ignore
-*/
-if (!defined('CONFIG_ACM_TYPE'))
-{
-	define('CONFIG_ACM_TYPE', 'file');
-}
-
 /**
 * Base cache class.
 *
@@ -63,6 +54,9 @@ class phpbb_acm
 	/**
 	* Magic method for calling type-specific functions.
 	* Functions directly supported are: get(), put(), exists(), destroy()
+	*
+	* The type is added to the methods name, for getting sql data just use get_sql() for example.
+	*
 	* see {@link phpbb_acm_abstract phpbb_acm_abstract} for more information
 	*
 	* @access public
@@ -176,8 +170,10 @@ class phpbb_acm
 	* @return bool	Returns true on success, else false.
 	* @access public
 	*/
-	public function register($cache_type, $cache_append = false, $cache_object = CONFIG_ACM_TYPE)
+	public function register($cache_type, $cache_append = false, $cache_object = false)
 	{
+		$cache_object = ($cache_object === false) ? basename(phpbb::$base_config['acm_type']) : basename($cache_object);
+
 		// We need to init every cache type...
 		if (!isset($this->cache_types[$cache_type]))
 		{
-- 
cgit v1.2.1