makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12775] Update container and config in install/

Browse source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau 2014-06-27 21:48:27 +02:00
parent cefffe0777
commit 91ca12f20e
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/install/install_convert.php
View file

@ -107,7 +107,7 @@ class install_convert extends module
function main($mode, $sub)
{
global $lang, $template, $phpbb_root_path, $phpEx, $cache, $config, $language, $table_prefix;
global $convert, $request, $phpbb_container;
global $convert, $request, $phpbb_container, $phpbb_config_php_handler;
$this->tpl_name = 'install_convert';
$this->mode = $mode;
@ -127,7 +127,8 @@ class install_convert extends module
// Enable super globals to prevent issues with the new \phpbb\request\request object
$request->enable_super_globals();
// Create a normal container now
$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container();
// Create cache
$cache = $phpbb_container->get('cache');
@ -135,7 +136,9 @@ class install_convert extends module
switch ($sub)
{
case 'intro':
require($phpbb_root_path . 'config.' . $phpEx);
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -224,7 +227,9 @@ class install_convert extends module
// This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
$cache->purge();
require($phpbb_root_path . 'config.' . $phpEx);
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -370,9 +375,11 @@ class install_convert extends module
*/
function get_convert_settings($sub)
{
global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache;
global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_handler;
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
require($phpbb_root_path . 'config.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -614,9 +621,11 @@ class install_convert extends module
{
global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth;
global $convert, $convert_row, $message_parser, $skip_rows, $language;
global $request;
global $request, $phpbb_config_php_handler;
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
require($phpbb_root_path . 'config.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);

5
phpBB/install/install_install.php
View file

@ -51,7 +51,7 @@ class install_install extends module
function main($mode, $sub)
{
global $lang, $template, $language, $phpbb_root_path, $phpEx;
global $phpbb_container, $cache, $phpbb_log, $request;
global $phpbb_container, $cache, $phpbb_log, $request, $phpbb_config_php_handler;
switch ($sub)
{
@ -104,7 +104,8 @@ class install_install extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container();
// Sets the global variables
$cache = $phpbb_container->get('cache');

15
phpBB/install/install_update.php
View file

@ -66,7 +66,9 @@ class install_update extends module
function main($mode, $sub)
{
global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container;
global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_handler;
extract($phpbb_config_php_handler->get_all());
// We must enable super globals, otherwise creating a new instance of the request class,
// using the new container with a dbal connection will fail with the following PHP Notice:
@ -74,14 +76,14 @@ class install_update extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_dump_container(false);
$phpbb_container_factory->set_use_extensions(false);
if (file_exists($phpbb_root_path . 'install/update/new/config'))
{
$phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'install/update/new/config');
}
else
{
$phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'config');
$phpbb_container_factory->set_config_path($phpbb_root_path . 'install/update/new/config');
}
$phpbb_container = $phpbb_container_factory->get_container();
// Writes into global $cache
$cache = $phpbb_container->get('cache');
@ -93,7 +95,6 @@ class install_update extends module
$this->new_location = $phpbb_root_path . 'install/update/new/';
// Init DB
require($phpbb_root_path . 'config.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
// Special options for conflicts/modified files