aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-16 00:06:52 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-16 00:06:52 +0100
commitd0ce6a18df2172a6e9baf1f1c2802efb30b25323 (patch)
tree478bf6c878bacec7c4e60832e0af7d106bd52e52 /phpBB/install
parent00d71d854cb844cba7755a2e8adfa4217dbc0ef0 (diff)
parent6debd9a1bea4ee69a06eac43cc6b2f856f601604 (diff)
downloadforums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar
forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.gz
forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.bz2
forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.xz
forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.zip
Merge pull request #4171 from CHItA/ticket/14462
[ticket/14462] Try to prevent timeouts in the installer * CHItA/ticket/14462: [ticket/14462] Not show timeout messages in convertors [ticket/14462] Make timeout error translateable [ticket/14462] Update ordering in install db config [ticket/14462] Fix comments [ticket/14462] Fix tests [ticket/14462] Fix CS and typo [ticket/14462] Set instance of db driver for database access using global [ticket/14462] Fix installation in tests [ticket/14462] Refactor tasks to be more modular [ticket/14462] Further speed improvements
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convert/controller/convertor.php21
1 files changed, 15 insertions, 6 deletions
diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php
index a36494c7e6..a40f1d0b52 100644
--- a/phpBB/install/convert/controller/convertor.php
+++ b/phpBB/install/convert/controller/convertor.php
@@ -13,6 +13,7 @@
namespace phpbb\convert\controller;
+use phpbb\cache\driver\driver_interface;
use phpbb\exception\http_exception;
use phpbb\install\controller\helper;
use phpbb\install\helper\container_factory;
@@ -36,11 +37,16 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
class convertor
{
/**
- * @var \phpbb\cache\driver\driver_interface
+ * @var driver_interface
*/
protected $cache;
/**
+ * @var driver_interface
+ */
+ protected $installer_cache;
+
+ /**
* @var \phpbb\config\db
*/
protected $config;
@@ -123,6 +129,7 @@ class convertor
/**
* Constructor
*
+ * @param driver_interface $cache
* @param container_factory $container
* @param database $db_helper
* @param helper $controller_helper
@@ -135,8 +142,9 @@ class convertor
* @param string $phpbb_root_path
* @param string $php_ext
*/
- public function __construct(container_factory $container, database $db_helper, helper $controller_helper, install_helper $install_helper, factory $iohandler, language $language, navigation_provider $nav, request_interface $request, template $template, $phpbb_root_path, $php_ext)
+ public function __construct(driver_interface $cache, container_factory $container, database $db_helper, helper $controller_helper, install_helper $install_helper, factory $iohandler, language $language, navigation_provider $nav, request_interface $request, template $template, $phpbb_root_path, $php_ext)
{
+ $this->installer_cache = $cache;
$this->controller_helper = $controller_helper;
$this->db_helper = $db_helper;
$this->install_helper = $install_helper;
@@ -379,6 +387,7 @@ class convertor
// If we reached this step (conversion completed) we want to purge the cache and log the user out.
// This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
$this->cache->purge();
+ $this->installer_cache->purge();
require_once($this->phpbb_root_path . 'includes/constants.' . $this->php_ext);
require_once($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext);
@@ -583,7 +592,7 @@ class convertor
$url = $this->controller_helper->route('phpbb_convert_convert', array('converter' => $convertor));
$this->iohandler->redirect($url);
- $this->iohandler->send_response();
+ $this->iohandler->send_response(true);
}
else
{
@@ -677,7 +686,7 @@ class convertor
if ($this->request->is_ajax())
{
$this->iohandler->add_user_form_group($form_title, $form_data);
- $this->iohandler->send_response();
+ $this->iohandler->send_response(true);
}
else
{
@@ -770,7 +779,7 @@ class convertor
if ($this->request->is_ajax())
{
$this->iohandler->add_error_message($msg, $desc);
- $this->iohandler->send_response();
+ $this->iohandler->send_response(true);
}
else
{
@@ -794,7 +803,7 @@ class convertor
public function redirect_to_html($url)
{
$this->iohandler->redirect($url);
- $this->iohandler->send_response();
+ $this->iohandler->send_response(true);
}
private function setup_navigation($stage)