From fbb4e05d9d21d66d007fd875b85fc1da93a3741b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Nallet Date: Thu, 14 Aug 2014 18:25:43 +0200 Subject: [PATCH] change to use AVATAR_HASH_USERDIRNAMES param even if AVATAR_USERID_HAS_USERDIRNAMES is True --- avatar/models.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/avatar/models.py b/avatar/models.py index 5f869a0..d68ec8f 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -25,13 +25,14 @@ avatar_storage = get_storage_class(settings.AVATAR_STORAGE)() def avatar_file_path(instance=None, filename=None, size=None, ext=None): tmppath = [settings.AVATAR_STORAGE_DIR] + userdirname = get_username(instance.user) if settings.AVATAR_USERID_HAS_USERDIRNAMES: - tmppath.append(str(instance.user_id)) - elif settings.AVATAR_HASH_USERDIRNAMES: - tmp = hashlib.md5(get_username(instance.user)).hexdigest() - tmppath.extend([tmp[0], tmp[1], get_username(instance.user)]) + userdirname = str(instance.user_id) + if settings.AVATAR_HASH_USERDIRNAMES: + tmp = hashlib.md5(userdirname).hexdigest() + tmppath.extend([tmp[0], tmp[1], userdirname]) else: - tmppath.append(get_username(instance.user)) + tmppath.append(userdirname) if not filename: # Filename already stored in database filename = instance.avatar.name