diff --git a/r2/r2/config/environment.py b/r2/r2/config/environment.py index 749d26b5d..8ae9123f4 100644 --- a/r2/r2/config/environment.py +++ b/r2/r2/config/environment.py @@ -58,7 +58,7 @@ def load_environment(global_conf={}, app_conf={}, setup_globals=True): config['pylons.h'] = r2.lib.helpers - config['r2.plugins'] = PluginLoader().load_plugins(getattr(g, 'plugins', [])) + g.plugins = config['r2.plugins'] = PluginLoader().load_plugins(g.config.get('plugins', [])) config['routes.map'] = routing.make_map() #override the default response options