wassname/flask-security
1
0
Fork 0
mirror of https://github.com/wassname/flask-security.git synced 2026-07-02 17:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:mattupstate/flask-security into develop

Browse Source
This commit is contained in:
Matt Wright
2012-06-18 16:52:00 -04:00
parent c20f244d66 cd35384ae8
commit f8cb2a413f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_security/core.py
+1 -1
View File
@@ -143,7 +143,7 @@ class Security(object):
login_manager.anonymous_user = AnonymousUser
login_manager.login_view = utils.config_value(app, 'LOGIN_VIEW')
login_manager.user_loader(load_user)
login_manager.setup_app(app)
login_manager.init_app(app)
Provider = utils.get_class_from_string(app, 'AUTH_PROVIDER')
pw_hash = utils.config_value(app, 'PASSWORD_HASH')
flask_security/recoverable.py
+1 -1
View File
@@ -61,7 +61,7 @@ def generate_reset_password_token(user):
try:
user['reset_password_token'] = token
user['reset_password_token'] = now
user['reset_password_sent_at'] = now
except TypeError:
user.reset_password_token = token
user.reset_password_sent_at = now