diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-04 11:25:27 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-04 11:25:27 +0100 |
| commit | 7423d48757bec0a81c8d439e911ed32d5af3a775 (patch) | |
| tree | 1af1b0991b7f9ffafc05392d1798e11f26647e89 /phpBB | |
| parent | e512ad67266e2fd4b427596d8a922bdc29aca617 (diff) | |
| download | forums-7423d48757bec0a81c8d439e911ed32d5af3a775.tar forums-7423d48757bec0a81c8d439e911ed32d5af3a775.tar.gz forums-7423d48757bec0a81c8d439e911ed32d5af3a775.tar.bz2 forums-7423d48757bec0a81c8d439e911ed32d5af3a775.tar.xz forums-7423d48757bec0a81c8d439e911ed32d5af3a775.zip | |
[ticket/10714] Get log from container in install, update and download/file
PHPBB3-10714
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/download/file.php | 1 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 4a392b002d..855813d0d2 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -67,6 +67,7 @@ if (isset($_GET['avatar'])) $phpbb_dispatcher = $phpbb_container->get('dispatcher'); $request = $phpbb_container->get('request'); $db = $phpbb_container->get('dbal.conn'); + $phpbb_log = $phpbb_container->get('log'); // Connect to DB if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false)) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4938ef0f87..23048df9fa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -123,6 +123,7 @@ $request = $phpbb_container->get('request'); $user = $phpbb_container->get('user'); $auth = $phpbb_container->get('auth'); $db = $phpbb_container->get('dbal.conn'); +$phpbb_log = $phpbb_container->get('log'); // make sure request_var uses this request instance request_var('', 0, false, false, $request); // "dependency injection" for a function diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index f0280acc40..d95a500929 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -53,7 +53,7 @@ class install_install extends module function main($mode, $sub) { global $lang, $template, $language, $phpbb_root_path, $phpEx; - global $phpbb_container, $cache; + global $phpbb_container, $cache, $phpbb_log; switch ($sub) { @@ -105,8 +105,9 @@ class install_install extends module // Create a normal container now $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); - // Sets the global $cache variable + // Sets the global variables $cache = $phpbb_container->get('cache'); + $phpbb_log = $phpbb_container->get('log'); $this->build_search_index($mode, $sub); $this->add_modules($mode, $sub); |