diff options
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 82ca0fc18d..d8b50c4aa3 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -84,6 +84,7 @@ class install_update extends module  		$phpbb_container = $phpbb_container_builder->get_container();  		// Writes into global $cache +		/* @var $cache \phpbb\cache\service */  		$cache = $phpbb_container->get('cache');  		$this->tpl_name = 'install_update'; @@ -114,7 +115,6 @@ class install_update extends module  		// We need to fill the config to let internal functions correctly work  		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); -		set_config(null, null, null, $config);  		set_config_count(null, null, null, $config);  		// Force template recompile @@ -161,6 +161,7 @@ class install_update extends module  		));  		// Get current and latest version +		/* @var $version_helper \phpbb\version_helper */  		$version_helper = $phpbb_container->get('version_helper');  		try  		{ @@ -234,7 +235,7 @@ class install_update extends module  		// Fill DB version  		if (empty($config['dbms_version']))  		{ -			set_config('dbms_version', $db->sql_server_info(true)); +			$config->set('dbms_version', $db->sql_server_info(true));  		}  		if ($this->test_update === false) @@ -519,6 +520,8 @@ class install_update extends module  				if ($all_up_to_date)  				{  					global $phpbb_container; + +					/* @var $phpbb_log \phpbb\log\log_interface */  					$phpbb_log = $phpbb_container->get('log');  					// Add database update to log @@ -1689,7 +1692,7 @@ class install_update extends module  					// Get custom installed styles...  					$sql = 'SELECT style_name, style_path  						FROM ' . STYLES_TABLE . " -						WHERE LOWER(style_name) NOT IN ('subsilver2', 'prosilver')"; +						WHERE LOWER(style_name) NOT IN ('prosilver')";  					$result = $db->sql_query($sql);  					$templates = array();  | 
