diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-05-08 00:55:57 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-05-08 00:55:57 +0200 |
| commit | 4c093e85c7457e989b22b5274f240e3ccfdab210 (patch) | |
| tree | 0a5c8fe8a3e38ef18ab1eedbe99c7df5931f4b13 /mediagoblin/app.py | |
| parent | a083786dcfc8499384ae600bf4f2c68a5d5639bf (diff) | |
| download | mediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.tar.lz mediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.tar.xz mediagoblin-4c093e85c7457e989b22b5274f240e3ccfdab210.zip | |
Made changes according to http://bugs.foocorp.net/issues/271#note-7
Signed-off-by: Joar Wandborg <git@wandborg.com>
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 59b943dd..ca3de6ca 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -36,6 +36,7 @@ class MediaGoblinApp(object): def __init__(self, connection, database_path, public_store, queue_store, staticdirector, + email_sender_address, user_template_path=None): # Get the template environment self.template_env = util.get_jinja_env(user_template_path) @@ -59,6 +60,7 @@ class MediaGoblinApp(object): # validators, etc, which might not access to the request # object. setup_globals( + email_sender_address=email_sender_address, db_connection=connection, database=self.db, public_store=self.public_store, @@ -139,6 +141,8 @@ def paste_app_factory(global_config, **app_config): connection, app_config.get('db_name', 'mediagoblin'), public_store=public_store, queue_store=queue_store, staticdirector=staticdirector, + email_sender_address=app_config.get('email_sender_address', + 'notice@medigoblin.org'), user_template_path=app_config.get('local_templates')) return mgoblin_app |