Module: check_mk
Branch: master
Commit: 15f449ddc7300c00ec97aa025b548eb1b42e968b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f449ddc7300c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 4 20:29:13 2013 +0100
Now really fixed duplicate tag registration
---
web/htdocs/config.py | 12 +-----------
web/htdocs/index.py | 4 ++--
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index 8e6b9b4..25dfd8d 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -408,17 +408,7 @@ def read_site_config():
def save_site_config():
save_user_file("siteconfig", user_siteconf)
-# Datastructures and functions needed before plugins can be loaded
-loaded_with_language = False
-
def load_plugins():
- global loaded_with_language
- if loaded_with_language == current_language:
- return
-
load_web_plugins("config", globals())
- # This must be set after plugin loading to make broken plugins raise
- # exceptions all the time and not only the first time (when the plugins
- # are loaded).
- loaded_with_language = current_language
+load_plugins()
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index 882bdf4..ffd836c 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -34,8 +34,8 @@ __builtin__.current_language = None
from mod_python import apache, util, Cookie
import sys, os, pprint
from lib import *
-import livestatus, defaults, config
-import htmllib, login, userdb, hooks, default_permissions
+import livestatus
+import defaults, config, htmllib, login, userdb, hooks, default_permissions
# Load page handlers
pagehandlers = {}