aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/console/command/extension/command.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-26 19:00:40 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-26 19:00:40 +0200
commit5e3ce27e139342464abd182e14a69e4324d3160f (patch)
treed433f0069d0eff5b6ded5dce5d7d72db51bc1772 /phpBB/phpbb/console/command/extension/command.php
parente2cb2ec66bf2569e4fc584b5b5fa709a9be13be4 (diff)
parenta6782801e768e9aac937c6670cd22f84dfdfb726 (diff)
downloadforums-5e3ce27e139342464abd182e14a69e4324d3160f.tar
forums-5e3ce27e139342464abd182e14a69e4324d3160f.tar.gz
forums-5e3ce27e139342464abd182e14a69e4324d3160f.tar.bz2
forums-5e3ce27e139342464abd182e14a69e4324d3160f.tar.xz
forums-5e3ce27e139342464abd182e14a69e4324d3160f.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
Diffstat (limited to 'phpBB/phpbb/console/command/extension/command.php')
-rw-r--r--phpBB/phpbb/console/command/extension/command.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/console/command/extension/command.php b/phpBB/phpbb/console/command/extension/command.php
index edde7ce2e2..72325ce768 100644
--- a/phpBB/phpbb/console/command/extension/command.php
+++ b/phpBB/phpbb/console/command/extension/command.php
@@ -13,9 +13,13 @@ abstract class command extends \phpbb\console\command\command
/** @var \phpbb\extension\manager */
protected $manager;
- function __construct(\phpbb\extension\manager $manager)
+ /** @var \phpbb\log\log */
+ protected $log;
+
+ public function __construct(\phpbb\extension\manager $manager, \phpbb\log\log $log)
{
$this->manager = $manager;
+ $this->log = $log;
parent::__construct();
}