makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10714] Get log from container in install, update and download/file

Browse source 
PHPBB3-10714
This commit is contained in:
Joas Schilling 2013-03-04 11:25:27 +01:00
parent e512ad6726
commit 7423d48757
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/download/file.php
View file

@ -67,6 +67,7 @@ if (isset($_GET['avatar']))
$phpbb_dispatcher = $phpbb_container->get('dispatcher'); $phpbb_dispatcher = $phpbb_container->get('dispatcher');
$request = $phpbb_container->get('request'); $request = $phpbb_container->get('request');
$db = $phpbb_container->get('dbal.conn'); $db = $phpbb_container->get('dbal.conn');
$phpbb_log = $phpbb_container->get('log');
// Connect to DB // Connect to DB
if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false)) if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false))

1
phpBB/install/database_update.php
View file

@ -123,6 +123,7 @@ $request = $phpbb_container->get('request');
$user = $phpbb_container->get('user'); $user = $phpbb_container->get('user');
$auth = $phpbb_container->get('auth'); $auth = $phpbb_container->get('auth');
$db = $phpbb_container->get('dbal.conn'); $db = $phpbb_container->get('dbal.conn');
$phpbb_log = $phpbb_container->get('log');
// make sure request_var uses this request instance // make sure request_var uses this request instance
request_var('', 0, false, false, $request); // "dependency injection" for a function request_var('', 0, false, false, $request); // "dependency injection" for a function

5
phpBB/install/install_install.php
View file

@ -53,7 +53,7 @@ class install_install extends module
function main($mode, $sub) function main($mode, $sub)
{ {
global $lang, $template, $language, $phpbb_root_path, $phpEx; global $lang, $template, $language, $phpbb_root_path, $phpEx;
global $phpbb_container, $cache; global $phpbb_container, $cache, $phpbb_log;
switch ($sub) switch ($sub)
{ {
@ -105,8 +105,9 @@ class install_install extends module
// Create a normal container now // Create a normal container now
$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
// Sets the global $cache variable // Sets the global variables
$cache = $phpbb_container->get('cache'); $cache = $phpbb_container->get('cache');
$phpbb_log = $phpbb_container->get('log');
$this->build_search_index($mode, $sub); $this->build_search_index($mode, $sub);
$this->add_modules($mode, $sub); $this->add_modules($mode, $sub);