Browse Source

Possible import loop between DBSettings and User model solved

Ralfp 12 years ago
parent
commit
2acb854b11
1 changed files with 1 additions and 1 deletions
  1. 1 1
      misago/models/usermodel.py

+ 1 - 1
misago/models/usermodel.py

@@ -14,7 +14,6 @@ from django.utils import timezone as tz_util
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 from misago.acl.builder import build_acl
 from misago.acl.builder import build_acl
 from misago.monitor import Monitor
 from misago.monitor import Monitor
-from misago.dbsettings import DBSettings
 from misago.signals import delete_user_content, rename_user
 from misago.signals import delete_user_content, rename_user
 from misago.utils.avatars import avatar_size
 from misago.utils.avatars import avatar_size
 from misago.utils.strings import random_string, slugify
 from misago.utils.strings import random_string, slugify
@@ -47,6 +46,7 @@ class UserManager(models.Manager):
         try:
         try:
             db_settings = request.settings
             db_settings = request.settings
         except AttributeError:
         except AttributeError:
+            from misago.dbsettings import DBSettings
             db_settings = DBSettings()
             db_settings = DBSettings()
 
 
         if timezone == False:
         if timezone == False: