Added client registration caps to OAuth plugin

[mediagoblin.git] / mediagoblin / app.py

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 33acbba033af86572d69ef2199de926652c77764..51f5899a0538be7bf42417fd65b4c94798475302 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -32,6 +32,7 @@ from mediagoblin.init.plugins import setup_plugins
 from mediagoblin.init import (get_jinja_loader, get_staticdirector,
     setup_global_and_app_config, setup_workbench, setup_database,
     setup_storage, setup_beaker_cache)
+from mediagoblin.tools.pluginapi import PluginManager
 
 
 _log = logging.getLogger(__name__)
@@ -75,17 +76,20 @@ class MediaGoblinApp(object):
         self.connection, self.db = setup_database()
 
         # Register themes
-        self.theme_registry = register_themes(app_config)
+        self.theme_registry, self.current_theme = register_themes(app_config)
 
         # Get the template environment
         self.template_loader = get_jinja_loader(
-            app_config.get('local_templates'))
+            app_config.get('local_templates'),
+            self.current_theme,
+            PluginManager().get_template_paths()
+            )
 
         # Set up storage systems
         self.public_store, self.queue_store = setup_storage()
 
         # set up routing
-        self.routing = routing.get_mapper()
+        self.routing = routing.get_mapper(PluginManager().get_routes())
 
         # set up staticdirector tool
         self.staticdirector = get_staticdirector(app_config)