diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
| commit | bc4c240385d51b91419f3484819dfc7e35eaf261 (patch) | |
| tree | 6f685c84b68475cf29b497d3b28872b89e0e435b /core/Log.php | |
| parent | 0d37b7f1de8a5e5eedc29a5b0c9091bb24217173 (diff) | |
| parent | 715cff5e3e0affc9c250eaacbcd5bc05308f4bc0 (diff) | |
Merge branch 'master' into report_and_dimension_refactoring
Conflicts:
core/FrontController.php
core/Log.php
plugins/API/API.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/UI
Diffstat (limited to 'core/Log.php')
| -rw-r--r-- | core/Log.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/Log.php b/core/Log.php index 6a9ebefc57..7d9e501ddf 100644 --- a/core/Log.php +++ b/core/Log.php @@ -373,6 +373,12 @@ class Log extends Singleton $this->currentLogLevel = $logLevel; } + + public function getLogLevel() + { + return $this->currentLogLevel; + } + public function customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, $addTrace = true) { if ($addTrace) { |