don't export misc in substitutions vars (really)

This commit is contained in:
Thomas NOËL 2011-08-03 12:33:51 +00:00
parent 8797f83429
commit d7cbeb627e
1 changed files with 8 additions and 6 deletions

View File

@ -38,7 +38,6 @@ import locale
import linecache
import formatter
from StringIO import StringIO
import misc
try:
import elementtree.ElementTree as ET
@ -707,11 +706,14 @@ class QommonPublisher(Publisher):
return str.decode('utf-8').encode(self.site_charset)
def get_substitution_variables(self):
site_name = get_cfg('misc', {}).get('sitename', None)
site_theme = get_cfg('branding', {}).get('theme', self.default_theme)
today = strftime.strftime(misc.date_format(), time.localtime())
now = misc.localstrftime(time.localtime())
return locals()
import misc
return {
'site_name': get_cfg('misc', {}).get('sitename', None),
'site_theme': get_cfg('branding', {}).get('theme', self.default_theme),
'today': strftime.strftime(misc.date_format(), time.localtime()),
'now': misc.localstrftime(time.localtime()),
}
def get_cfg(key, default = None):
r = get_publisher().cfg.get(key, default)