From 2a2966fc563d963fa4879da57c846881c19e0c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20Mo=C3=9Fhammer?= <jannis.mosshammer@netways.de>
Date: Wed, 7 Aug 2013 17:51:52 +0200
Subject: [PATCH] Fix Config.php relocation, fix header.phtml crashing due to
 old tab rendering

refs #4192
---
 application/controllers/DashboardController.php                 | 2 +-
 application/forms/Dashboard/AddUrlForm.php                      | 2 +-
 .../application/views/scripts/show/components/header.phtml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index c215c0a3f..483060361 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -4,7 +4,7 @@ use Icinga\Web\ActionController;
 use Icinga\Web\Url;
 use Icinga\Application\Icinga;
 use Icinga\Web\Widget\Dashboard;
-use Icinga\Application\Config as IcingaConfig;
+use Icinga\Config\Config as IcingaConfig;
 use Icinga\Form\Dashboard\AddUrlForm;
 use Icinga\Exception\ConfigurationError;
 
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 21d452111..bd56564d7 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Form\Dashboard;
 
-use Icinga\Application\Config as IcingaConfig;
+use Icinga\Config\Config as IcingaConfig;
 use Icinga\Web\Form;
 use Icinga\Web\Widget\Dashboard;
 use Zend_Form_Element_Text;
diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index 67c967483..337cbd19c 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -1,6 +1,6 @@
 <? $showService = $object->service_description && $tabs->getActiveName() !== 'host' ?>
 <? if (! $compact): ?>
-<?= $tabs ?>
+<?= $tabs->render($this) ?>
 <? endif ?>
 <table style="margin-bottom: 1em">
   <tr class="<?= $this->monitoringState($object, 'host') ?><?= $object->host_handled ? ' handled' : '' ?>">