[#2375] fix app globals initialisation issue

ckan · Aug 10, 2012 · b53c8c8 · b53c8c8
1 parent 3d78e31
commit b53c8c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/ckan/config/environment.py b/ckan/config/environment.py
@@ -175,6 +175,8 @@ def find_controller(self, controller):
 
     config['routes.map'] = routing.make_map()
     config['pylons.app_globals'] = app_globals.app_globals
+    # initialise the globals
+    config['pylons.app_globals']._init()
 
     # add helper functions
     restrict_helpers = asbool(

diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
@@ -116,7 +116,9 @@ def __init__(self):
         initialization and is available during requests via the
         'app_globals' variable
         '''
+        self._init()
 
+    def _init(self):
         self.favicon = config.get('ckan.favicon', '/images/icons/ckan.ico')
         facets = config.get('search.facets', 'groups tags res_format license')
         self.facets = facets.split()