From c76729a821a3322aece9a519c097df27b80c8c99 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 11 Mar 2014 20:45:01 +0100
Subject: [PATCH 1/2] Fix CLI complaining without log config

---
 library/Icinga/Application/Cli.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index b65236845..ebfa06c39 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -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';
         }

From f1f1813b04775ff6899722ca9a0cf4984c3aabf5 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 12 Mar 2014 00:44:30 +0100
Subject: [PATCH 2/2] Activate only the first match if multiple menu items
 carry the same URL

---
 public/js/icinga/loader.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index c186f9655..9795f0431 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -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');
                     }