Merge branch 'v1.3.x'

Conflicts: UPDATES
bread-and-pepper · Jan 9, 2015 · cc88cef · cc88cef
2 parents 199c24b + 59ae1ae
commit cc88cef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/UPDATES b/UPDATES
@@ -1,5 +1,9 @@
 This file contains all the backwards-incompatible changes.
 
+Version 1.3.2
+
+- creating new user always creates new empty userena profile (fixes bug from 1.3.1)
+
 Version 1.3.1
 
 - when USERENA_ACTIVATION_REQUIRED = False, creating new user does not automatically

diff --git a/userena/__init__.py b/userena/__init__.py
@@ -4,7 +4,7 @@
 """
 default_app_config = 'userena.apps.UserenaConfig'
 
-VERSION = (1, 3, 1)
+VERSION = (1, 3, 2)
 
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 

diff --git a/userena/managers.py b/userena/managers.py
@@ -72,8 +72,9 @@ def create_user(self, username, email, password, active=False,
         for perm in ASSIGNED_PERMISSIONS['user']:
             assign_perm(perm[0], new_user, new_user)
 
+        userena_profile = self.create_userena_profile(new_user)
+
         if send_email:
-            userena_profile = self.create_userena_profile(new_user)
             userena_profile.send_activation_email()
 
         return new_user