From 44154fe9145fcd49b37c6d75260e8809109d5bff Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sun, 2 Aug 2015 15:15:52 +0200
Subject: [PATCH] ObjectController: directly use this->object

---
 library/Director/Web/Controller/ObjectController.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php
index 780fb392..055eafcc 100644
--- a/library/Director/Web/Controller/ObjectController.php
+++ b/library/Director/Web/Controller/ObjectController.php
@@ -65,7 +65,7 @@ abstract class ObjectController extends ActionController
     {
         $type = $this->getType();
         $this->getTabs()->activate('render');
-        $this->view->object = $this->object();
+        $this->view->object = $this->object;
         $this->render('object/show', null, true);
     }
 
@@ -171,11 +171,10 @@ abstract class ObjectController extends ActionController
     {
         $type = $this->getType();
         $this->getTabs()->activate('history');
-        $object = $this->object();
         $this->view->title = $this->translate('Activity Log');
         $this->view->table = $this->applyPaginationLimits(
             $this->loadTable('activityLog')->setConnection($this->db())
-            ->filterObject('icinga_' . $type, $object->object_name)
+            ->filterObject('icinga_' . $type, $this->object->object_name)
         );
         $this->render('object/history', null, true);
     }