Merge branch 'MDL-43411-26' of git://github.com/andrewnicols/moodle i…

…nto MOODLE_26_STABLE
moodle · Jan 7, 2014 · 3a8e16e · 3a8e16e
2 parents 9fe6a6f + 5c7d7de
commit 3a8e16e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/course/lib.php b/course/lib.php
@@ -3210,7 +3210,7 @@ function include_course_ajax($course, $usedmodules = array(), $enabledmodules =
     );
 
     // Include course dragdrop
-    if ($course->id != $SITE->id) {
+    if (course_format_uses_sections($course->format)) {
         $PAGE->requires->yui_module('moodle-course-dragdrop', 'M.course.init_section_dragdrop',
             array(array(
                 'courseid' => $course->id,
@@ -3248,8 +3248,8 @@ function include_course_ajax($course, $usedmodules = array(), $enabledmodules =
             'emptydragdropregion'
         ), 'moodle');
 
-    // Include format-specific strings
-    if ($course->id != $SITE->id) {
+    // Include section-specific strings for formats which support sections.
+    if (course_format_uses_sections($course->format)) {
         $PAGE->requires->strings_for_js(array(
                 'showfromothers',
                 'hidefromothers',