From 9329b16ab13f3a4caf107df358c3c58bda2dcd8a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 3 Nov 2010 18:35:31 +0100
Subject: [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
---
 phpBB/install/index.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/index.php')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 1a037fe496..6486eb09d8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -163,8 +163,6 @@ if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
 include($phpbb_root_path . 'includes/template.' . $phpEx);
-include($phpbb_root_path . 'includes/acm/acm_file.' . $phpEx);
-include($phpbb_root_path . 'includes/cache.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
@@ -172,6 +170,11 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
 $class_loader->register();
 
+// 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();
 
 // make sure request_var uses this request instance
-- 
cgit v1.2.1