Merge pull request #286 from open-craft/discussion-integration

Discussion integration

common/djangoapps/util/request.py

@@ -42,6 +42,9 @@ def course_id_from_url(url):
     if '/' in url:
         deprecated = True
 
+    # Ignore query string
+    url = url.split('?')[0]
+
     if deprecated:
         COURSE_REGEX = re.compile(r'^.*/courses/(?P<course_id>[^/]+/[^/]+/[^/]+)')
         key_generator = SlashSeparatedCourseKey.from_deprecated_string

common/lib/xmodule/xmodule/x_module.py

@@ -1266,7 +1266,7 @@ class DiscussionService(object):
         user_cohort_id = get_cohort_id(user, course_id)
 
         unsafethreads, query_params = get_threads(request, course_id)
-        threads = [utils.safe_content(thread) for thread in unsafethreads]
+        threads = [utils.safe_content(thread, course_id) for thread in unsafethreads]
 
         flag_moderator = cached_has_permission(user, 'openclose_thread', course_id) or \
                          has_access(user, 'staff', course)