Skip to content

E
edx-platform
Commit bff9ddf1 by stv
Options

Backport release 

from Stanford-Online/release
into Stanford-Online/master
parents dd6be839 13a94a65
Showing with 2 additions and 0 deletions
cms/djangoapps/contentstore/views/course.py
...@@ -478,6 +478,7 @@ def send_test_enrollment_email(request): ...@@ -478,6 +478,7 @@ def send_test_enrollment_email(request):
user = request.user user = request.user
from_address = microsite.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL) from_address = microsite.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)
subject = request.POST.get('subject') subject = request.POST.get('subject')
subject = ''.join(subject.splitlines())
message = request.POST.get('message') message = request.POST.get('message')
try: try:
......
common/djangoapps/student/views.py
...@@ -747,6 +747,7 @@ def notify_enrollment_by_email(course, user, request): ...@@ -747,6 +747,7 @@ def notify_enrollment_by_email(course, user, request):
subject = get_course_about_section(course, 'pre_enrollment_email_subject') subject = get_course_about_section(course, 'pre_enrollment_email_subject')
message = get_course_about_section(course, 'pre_enrollment_email') message = get_course_about_section(course, 'pre_enrollment_email')
subject = ''.join(subject.splitlines())
user.email_user(subject, message, from_address) user.email_user(subject, message, from_address)
except Exception: except Exception:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment