aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/style.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-11-03 18:35:31 +0100
committerIgor Wiedler <igor@wiedler.ch>2011-01-09 23:49:35 +0100
commit9329b16ab13f3a4caf107df358c3c58bda2dcd8a (patch)
tree0b5faa7111c792565062c93b1c1a44eda50d4664 /phpBB/style.php
parent36e95f939db9b88b8519d956120d161102184ccb (diff)
downloadforums-9329b16ab13f3a4caf107df358c3c58bda2dcd8a.tar
forums-9329b16ab13f3a4caf107df358c3c58bda2dcd8a.tar.gz
forums-9329b16ab13f3a4caf107df358c3c58bda2dcd8a.tar.bz2
forums-9329b16ab13f3a4caf107df358c3c58bda2dcd8a.tar.xz
forums-9329b16ab13f3a4caf107df358c3c58bda2dcd8a.zip
[task/acm-refactor] Refactor the ACM classes to have a common interface.
They are now refered to as cache drivers rather than ACM classes. The additional utility functions from the original cache class have been moved to the cache_service. The class loader is now instantiated without a cache instance and passed one as soon as it is constructed to allow autoloading the cache classes. PHPBB3-9983
Diffstat (limited to 'phpBB/style.php')
-rw-r--r--phpBB/style.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/phpBB/style.php b/phpBB/style.php
index 3c2f94023b..418bbb9bab 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -57,18 +57,19 @@ if ($id)
{
// Include files
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
- require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
- require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
- $cache = new cache();
-
- $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache);
+ $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
$class_loader->register();
- $request = new phpbb_request();
+ // set up caching
+ $acm = phpbb_cache_factory::create($acm_type)->get_acm();
+ $class_loader->set_acm($acm);
+ $cache = new phpbb_cache_service($acm);
+
+ $request = new phpbb_request();
$db = new $sql_db();
// make sure request_var uses this request instance
@@ -308,5 +309,3 @@ if ($id)
}
$db->sql_close();
}
-
-exit;