Switch to unified view

a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
...
...
14
from allura.config.environment import load_environment
14
from allura.config.environment import load_environment
15
from allura.config.app_cfg import ForgeConfig
15
from allura.config.app_cfg import ForgeConfig
16
from allura.lib.custom_middleware import StatsMiddleware
16
from allura.lib.custom_middleware import StatsMiddleware
17
from allura.lib.custom_middleware import SSLMiddleware
17
from allura.lib.custom_middleware import SSLMiddleware
18
from allura.lib.custom_middleware import StaticFilesMiddleware
18
from allura.lib.custom_middleware import StaticFilesMiddleware
19
from allura.lib.custom_middleware import CSRFMiddleware
19
from allura.lib import patches
20
from allura.lib import patches
20
21
21
__all__ = ['make_app']
22
__all__ = ['make_app']
22
23
23
# Use base_config to setup the necessary PasteDeploy application factory. 
24
# Use base_config to setup the necessary PasteDeploy application factory. 
...
...
84
    ew.render.TemplateEngine.register_variable_provider(get_tg_vars)
85
    ew.render.TemplateEngine.register_variable_provider(get_tg_vars)
85
86
86
    app = StaticFilesMiddleware(app, app_conf.get('static.script_name'))
87
    app = StaticFilesMiddleware(app, app_conf.get('static.script_name'))
87
    app = set_scheme_middleware(app)
88
    app = set_scheme_middleware(app)
88
    app = credentials_middleware(app)
89
    app = credentials_middleware(app)
90
    if not app_conf.get('disable_csrf_protection'):
91
        app = CSRFMiddleware(app, 'allura')
89
92
90
    return app
93
    return app
91
    
94
    
92
def set_scheme_middleware(app):
95
def set_scheme_middleware(app):
93
    def SchemeMiddleware(environ, start_response):
96
    def SchemeMiddleware(environ, start_response):