tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.icinga.org:icingaweb2

This commit is contained in:
Alexander Klimov 2014-03-12 11:22:56 +01:00
parent fbd354fa55 f1f1813b04
commit 91b1a649a7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Application/Cli.php
View File

@ -75,8 +75,8 @@ class Cli extends ApplicationBootstrap
protected function fixLoggingConfig()
{
$conf = & $this->getConfig()->logging;
if ($conf->type === 'stream') {
$conf = $this->config->logging;
if (! isset($conf->type) || $conf->type === 'stream') {
$conf->level = $this->verbose;
$conf->target = 'php://stderr';
}

2
public/js/icinga/loader.js
View File

@ -252,6 +252,8 @@
$el.closest('li').addClass('active');
$el.parents('li').addClass('active');
}
// Interrupt .each, only on menu item shall be active
return false;
} else if ($(el).closest('table.action').length) {
$el.addClass('active');
}