diff options
| -rw-r--r-- | mediagoblin/app.py | 4 | ||||
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 4 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/verification_email.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 913e530e..2a2f21cc 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -18,7 +18,7 @@ import urllib import routes import mongokit -from paste.deploy.converters import asint +from paste.deploy.converters import asbool, asint from webob import Request, exc from mediagoblin import routing, util, models, storage, staticdirect @@ -148,7 +148,7 @@ def paste_app_factory(global_config, **app_config): staticdirector=staticdirector, email_sender_address=app_config.get( 'email_sender_address', 'notice@mediagoblin.example.org'), - email_debug_mode=app_config.get('email_debug_mode'), + email_debug_mode=asbool(app_config.get('email_debug_mode')), user_template_path=app_config.get('local_templates')) return mgoblin_app diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 6561c622..55e638b9 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -18,7 +18,7 @@ import os import mongokit from paste.deploy.loadwsgi import NicerConfigParser -from paste.deploy.converters import asint +from paste.deploy.converters import asint, asbool from mediagoblin import storage, models from mediagoblin.celery_setup import setup_celery_from_config @@ -86,7 +86,7 @@ def setup_self(setup_globals_func=setup_globals): db_connection=connection, database=db, public_store=public_store, - email_debug_mode=mgoblin_section.get('email_debug_mode'), + email_debug_mode=asbool(mgoblin_section.get('email_debug_mode')), email_sender_address=mgoblin_section.get( 'email_sender_address', 'notice@mediagoblin.example.org'), diff --git a/mediagoblin/templates/mediagoblin/auth/verification_email.txt b/mediagoblin/templates/mediagoblin/auth/verification_email.txt index ce0629eb..7863374d 100644 --- a/mediagoblin/templates/mediagoblin/auth/verification_email.txt +++ b/mediagoblin/templates/mediagoblin/auth/verification_email.txt @@ -19,4 +19,4 @@ Hi {{ username }}, to activate your GNU MediaGoblin account, open the following URL in your web browser -{{ verification_url }} +{{ verification_url|safe }} |