Merge pull request #10934 from edx/release

Hotfix 2015-12-09a and Hotfix 2015-12-09b
2015-12-10 15:45:14 -05:00
parent 259de40788 75bbed726d
commit a164e2fa0a
5 changed files with 72 additions and 10 deletions
--- a/lms/djangoapps/instructor/enrollment.py
+++ b/lms/djangoapps/instructor/enrollment.py
@@ -119,7 +119,7 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
        if CourseMode.is_white_label(course_id):
            course_mode = CourseMode.DEFAULT_SHOPPINGCART_MODE_SLUG
        else:
-            course_mode = CourseMode.DEFAULT_MODE_SLUG
+            course_mode = None

        if previous_state.enrollment:
            course_mode = previous_state.mode