diff options
| author | Michele Azzolari <macno@macno.org> | 2012-01-12 00:00:28 +0100 |
|---|---|---|
| committer | Michele Azzolari <macno@macno.org> | 2012-01-12 00:00:28 +0100 |
| commit | 7f251b037bd5207652ca73f556e90b9633786a3c (patch) | |
| tree | 0f7cd1ce6baa326d5ae4c835ba4efd0f2b35800c | |
| parent | f502a89b6dad993a44088a84c9f441fdc74189f8 (diff) | |
| download | mediagoblin-7f251b037bd5207652ca73f556e90b9633786a3c.tar.lz mediagoblin-7f251b037bd5207652ca73f556e90b9633786a3c.tar.xz mediagoblin-7f251b037bd5207652ca73f556e90b9633786a3c.zip | |
As suggested by Elrond, we use only one setting
| -rw-r--r-- | mediagoblin/config_spec.ini | 1 | ||||
| -rw-r--r-- | mediagoblin/submit/views.py | 2 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index d692f205..b8e7b193 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -51,7 +51,6 @@ allow_attachments = boolean(default=False) csrf_cookie_name = string(default='mediagoblin_csrftoken') # Push stuff -push_enabled = boolean(default=False) push_url = string(default='') [storage:publicstore] diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index d5aa60fa..de280422 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -126,7 +126,7 @@ def submit_start(request): # re-raise the exception raise - if mg_globals.app_config["push_enabled"]: + if mg_globals.app_config["push_url"]: feed_url=request.urlgen( 'mediagoblin.user_pages.atom_feed', qualified=True,user=request.user.username) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index ee7cfe0f..2d4eac69 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -235,7 +235,7 @@ def atom_feed(request): 'rel': 'alternate', 'type': 'text/html' }]; - if mg_globals.app_config["push_enabled"]: + if mg_globals.app_config["push_url"]: atomlinks.append({ 'rel': 'hub', 'href': mg_globals.app_config["push_url"]}) |