From de19745eb2a58507cf29e8b9a4588fe1f154111c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sun, 22 Jun 2014 13:54:02 +0200
Subject: [PATCH] ActionController: move moduleInit to Module controller

---
 library/Icinga/Web/Controller/ActionController.php       | 5 -----
 library/Icinga/Web/Controller/ModuleActionController.php | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index a36e8beb7..99c7d975a 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -121,7 +121,6 @@ class ActionController extends Zend_Controller_Action
         }
 
         $this->view->tabs = new Tabs();
-        $this->moduleInit();
         $this->init();
     }
 
@@ -171,10 +170,6 @@ class ActionController extends Zend_Controller_Action
         }
     }
 
-    protected function moduleInit()
-    {
-    }
-
     protected function reloadCss()
     {
         $this->reloadCss = true;
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 4f1a4c847..02467faa2 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -21,6 +21,7 @@ class ModuleActionController extends ActionController
         parent::__construct($request, $response, $invokeArgs);
         $this->moduleName = $request->getModuleName();
         $this->view->translationDomain = $this->moduleName;
+        $this->moduleInit();
     }
 
     public function Config($file = null)
@@ -41,4 +42,9 @@ class ModuleActionController extends ActionController
             return $this->configs[$file];
         }
     }
+
+
+    protected function moduleInit()
+    {
+    }
 }