aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php5
-rw-r--r--phpBB/install/install_update.php5
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 299467b5f3..a611a33125 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -111,6 +111,9 @@ $db = $phpbb_container->get('dbal.conn');
/* @var $phpbb_log \phpbb\log\log_interface */
$phpbb_log = $phpbb_container->get('log');
+/** @var \phpbb\language\language $language */
+$language = $phpbb_container->get('language');
+
// Grab global variables, re-cache if necessary
/* @var $config \phpbb\config\config */
$config = $phpbb_container->get('config');
@@ -188,7 +191,7 @@ $migrator = $phpbb_container->get('migrator');
/** @var \phpbb\filesystem\filesystem_interface $phpbb_filesystem */
$phpbb_filesystem = $phpbb_container->get('filesystem');
-$migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log', $phpbb_filesystem));
+$migrator->set_output_handler(new \phpbb\db\output_handler\log_wrapper_migrator_output_handler($language, new \phpbb\db\output_handler\html_migrator_output_handler($language), $phpbb_root_path . 'store/migrations_' . time() . '.log', $phpbb_filesystem));
$migrator->create_migrations_table();
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index d9ba2e7fe9..2f8fd71c54 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1115,7 +1115,7 @@ class install_update extends module
*/
function show_diff(&$update_list)
{
- global $phpbb_root_path, $template, $user, $request, $phpbb_adm_relative_path;
+ global $phpbb_root_path, $template, $user, $request;
$this->tpl_name = 'install_update_diff';
@@ -1669,10 +1669,9 @@ class install_update extends module
*/
function get_file($mode)
{
- global $user, $db;
+ global $user;
$errstr = '';
- $errno = 0;
switch ($mode)
{