diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-09 23:58:27 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-09 23:58:27 +0100 |
| commit | 95c683056b85399200e2caaa9aa65edc6843c16f (patch) | |
| tree | ac11043ba149791a225d587e7a61e34db75a04f6 /phpBB/install/index.php | |
| parent | 5373f8157d8a2619197702c3a00a6bb432ef3e25 (diff) | |
| parent | 1aef7eb20ee195c7f21d6c5b78653b7c43e669ec (diff) | |
| download | forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.gz forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.bz2 forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.xz forums-95c683056b85399200e2caaa9aa65edc6843c16f.zip | |
Merge branch 'task/acm-refactor' into develop
Conflicts:
tests/bootstrap.php
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 1a037fe496..653268ba68 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 +$cache_factory = new phpbb_cache_factory('file'); +$class_loader->set_cache($cache_factory->get_driver()); +$cache = $cache_factory->get_service(); + $request = new phpbb_request(); // make sure request_var uses this request instance @@ -259,7 +262,6 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle $user = new user(); $auth = new auth(); -$cache = new cache(); $template = new template(); // Add own hook handler, if present. :o |