aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-23 22:02:24 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-23 22:02:24 +0100
commitf283f5bd03776230df220ff0086d5d3fd3023bb8 (patch)
tree753626d39433344a5ca80323181058d8bf9c07d8 /phpBB/install
parent30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b (diff)
parent8d178f15f06e0f6b5e64447dc07157a796645572 (diff)
downloadforums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.gz
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.bz2
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.xz
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.zip
Merge pull request #4016 from CHItA/ticket/14270
[ticket/14270] Purge cache when the installer is finished * CHItA/ticket/14270: [ticket/14270] Purge cache when the installer is finished
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/app.php7
-rw-r--r--phpBB/install/startup.php1
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/app.php b/phpBB/install/app.php
index 9346351aba..9664f92cf1 100644
--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -30,7 +30,6 @@ $phpbb_filesystem = $phpbb_installer_container->get('filesystem');
/** @var \phpbb\template\template $template */
$template = $phpbb_installer_container->get('template');
-
// Path to templates
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir');
@@ -42,17 +41,17 @@ $template->set_custom_style(array(
),
), $paths);
-/* @var $phpbb_dispatcher \phpbb\event\dispatcher */
+/** @var $phpbb_dispatcher \phpbb\event\dispatcher */
$phpbb_dispatcher = $phpbb_installer_container->get('dispatcher');
/** @var \phpbb\language\language $language */
$language = $phpbb_installer_container->get('language');
$language->add_lang(array('common', 'acp/common', 'acp/board', 'install', 'posting'));
-/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */
+/** @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */
$http_kernel = $phpbb_installer_container->get('http_kernel');
-/* @var $symfony_request \phpbb\symfony_request */
+/** @var $symfony_request \phpbb\symfony_request */
$symfony_request = $phpbb_installer_container->get('symfony_request');
$response = $http_kernel->handle($symfony_request);
$response->send();
diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php
index 766f6be38a..b40face4f8 100644
--- a/phpBB/install/startup.php
+++ b/phpBB/install/startup.php
@@ -81,4 +81,5 @@ $config_path = (file_exists($other_config_path . '/installer/config.yml')) ? $ot
$phpbb_installer_container = $phpbb_installer_container_builder
->with_config_path($config_path)
+ ->with_custom_parameters(array('cache.driver.class' => 'phpbb\cache\driver\file'))
->get_container();