diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-09-20 16:55:06 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-09-20 16:55:06 -0300 |
| commit | dca33d4bdb002a1c882ba0b1f79523655f947fe9 (patch) | |
| tree | 6921db98cd4d66693cc58161c7ce2eefd4cce288 | |
| parent | d967dc8765eeb8f2b11a206a0cb7f041b752b583 (diff) | |
| download | askbot-dca33d4bdb002a1c882ba0b1f79523655f947fe9.tar.gz askbot-dca33d4bdb002a1c882ba0b1f79523655f947fe9.tar.bz2 askbot-dca33d4bdb002a1c882ba0b1f79523655f947fe9.zip | |
fixed the double prefix issue in the instant emails
| -rw-r--r-- | askbot/models/__init__.py | 1 | ||||
| -rw-r--r-- | askbot/utils/mail.py | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index d7c034e3..17723ce5 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2232,7 +2232,6 @@ def format_instant_notification_email( 'origin_post_title': origin_post.title, 'user_subscriptions_url': user_subscriptions_url, } - subject_line = mail.prefix_the_subject_line(subject_line) return subject_line, template.render(Context(update_data)) #todo: action diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index ae655f4c..3eb9e97d 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -15,9 +15,9 @@ def prefix_the_subject_line(subject): EMAIL_SUBJECT_LINE_PREFIX either from from live settings, which take default from django """ - prefix = askbot_settings.EMAIL_SUBJECT_PREFIX.strip() + prefix = askbot_settings.EMAIL_SUBJECT_PREFIX if prefix != '': - subject = prefix + ' ' + subject + subject = prefix.strip() + ' ' + subject.strip() return subject def extract_first_email_address(text): @@ -89,10 +89,9 @@ def send_mail( if raise_on_failure is True, exceptions.EmailNotSent is raised """ - prefix = askbot_settings.EMAIL_SUBJECT_PREFIX.strip() + ' ' try: assert(subject_line is not None) - subject_line = prefix + subject_line + subject_line = prefix_the_subject_line(subject_line) msg = mail.EmailMessage( subject_line, body_text, |