diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-12-05 17:54:38 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-12-05 17:54:38 -0300 |
| commit | 2011383985288497db3322a2d05c8aa6f8f5e8d6 (patch) | |
| tree | 3782c3047ba7a435ff4993d1081ed6e98b207b04 /askbot/views/users.py | |
| parent | 56a3187a88927e8eb1bdc1c48f3f230ec5e42580 (diff) | |
| download | askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.tar.gz askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.tar.bz2 askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.zip | |
bugfixes: 1) global subscribers get emails even if frequency is zero; 2) if subscribed tag set is enabled users wont get emails on tag subscription; 3) if email is read-only email is lost upon editing user profile; 4) in some browsers there is horizontal scroll in the post body, which should not be there
Diffstat (limited to 'askbot/views/users.py')
| -rw-r--r-- | askbot/views/users.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/askbot/views/users.py b/askbot/views/users.py index 414ac8b0..5524ebd8 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -317,9 +317,9 @@ def edit_user(request, id): if request.method == "POST": form = forms.EditUserForm(user, request.POST) if form.is_valid(): - new_email = sanitize_html(form.cleaned_data['email']) - - set_new_email(user, new_email) + if 'email' in form.cleaned_data and askbot_settings.EDITABLE_EMAIL: + new_email = sanitize_html(form.cleaned_data['email']) + set_new_email(user, new_email) if askbot_settings.EDITABLE_SCREEN_NAME: new_username = sanitize_html(form.cleaned_data['username']) |