aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-13 21:53:29 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-13 21:53:29 +0200
commit2124b0f32351e5d27addb0eca1860eaf4caf0a4e (patch)
tree209cbfdace42321766b0c9df293f7ead3b2c4c16
parentTest with postmark OK. (diff)
downloadnewspipe-2124b0f32351e5d27addb0eca1860eaf4caf0a4e.tar.gz
newspipe-2124b0f32351e5d27addb0eca1860eaf4caf0a4e.tar.bz2
newspipe-2124b0f32351e5d27addb0eca1860eaf4caf0a4e.zip
Removed ADMIN_PLATFORM_EMAIL env variable.
-rw-r--r--conf.py2
-rw-r--r--pyaggr3g470r/views.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/conf.py b/conf.py
index aba7253d..2ad949a8 100644
--- a/conf.py
+++ b/conf.py
@@ -34,7 +34,6 @@ if not ON_HEROKU:
config.read("./conf/conf.cfg")
PLATFORM_URL = config.get('misc', 'platform_url')
- ADMIN_PLATFORM_EMAIL = config.get('misc', 'admin_platform_email')
RECAPTCHA_PUBLIC_KEY = config.get('misc', 'recaptcha_public_key')
RECAPTCHA_PRIVATE_KEY = config.get('misc', 'recaptcha_private_key')
@@ -63,7 +62,6 @@ if not ON_HEROKU:
else:
PLATFORM_URL = os.environ.get('PLATFORM_URL', 'https://pyaggr3g470r.herokuapp.com/')
- ADMIN_PLATFORM_EMAIL = os.environ.get('ADMIN_PLATFORM_EMAIL', '')
RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', '')
RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', '')
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 7e73b7da..bbc19b46 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -144,7 +144,7 @@ def login():
identity_changed.send(current_app._get_current_object(), identity=Identity(user.id))
flash(gettext("Logged in successfully."), 'success')
return redirect(url_for('home'))
- return render_template('login.html', form=form, email=conf.ADMIN_PLATFORM_EMAIL)
+ return render_template('login.html', form=form)
@app.route('/logout/')
@login_required
bgstack15