From 83af3d409013d6f2597a9df0de7d152f16abd67a Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 6 Dec 2012 15:39:41 -0500 Subject: [PATCH] do_activate_user: Fix join_date default. (imported from commit ea9f933d6f7e36964ed19ef6d819ad5edc34c483) --- zephyr/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zephyr/models.py b/zephyr/models.py index 875adab7de..ad39d26851 100644 --- a/zephyr/models.py +++ b/zephyr/models.py @@ -604,7 +604,7 @@ def log_subscription_property_change(user_email, property, property_dict): event.update(property_dict) log_event(event) -def do_activate_user(user, log=True, join_date=time.time()): +def do_activate_user(user, log=True, join_date=timezone.now()): user.is_active = True user.set_password(initial_password(user.email)) user.date_joined = join_date