Module: check_mk
Branch: master
Commit: 584aa93d454d645a89e71d93f841b976977a3052
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=584aa93d454d64…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 4 19:31:00 2013 +0100
Fixed duplicated registration of hosttags
---
web/htdocs/config.py | 5 -----
web/htdocs/index.py | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index 0f72595..8e6b9b4 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -411,7 +411,6 @@ def save_site_config():
# Datastructures and functions needed before plugins can be loaded
loaded_with_language = False
-# Load all view plugins
def load_plugins():
global loaded_with_language
if loaded_with_language == current_language:
@@ -423,7 +422,3 @@ def load_plugins():
# exceptions all the time and not only the first time (when the plugins
# are loaded).
loaded_with_language = current_language
-
-# Make sure, we have all values set right now - until
-# the configuration will be loaded
-load_plugins()
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index ffd836c..3eb3cb8 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -34,8 +34,9 @@ __builtin__.current_language = None
from mod_python import apache, util, Cookie
import sys, os, pprint
from lib import *
-import livestatus
-import defaults, config, htmllib, login, userdb, hooks, default_permissions
+import livestatus, defaults, config
+config.load_plugins()
+import htmllib, login, userdb, hooks, default_permissions
# Load page handlers
pagehandlers = {}