Merge branch 'MDL-54557-31' of git://github.com/marinaglancy/moodle i…

…nto MOODLE_31_STABLE
moodle · Jun 6, 2016 · 5bb6def · 5bb6def
2 parents 1b6d059 + 32e7905
commit 5bb6def
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/course/format/lib.php b/course/format/lib.php
@@ -984,14 +984,14 @@ public function delete_section($section, $forcedeleteifnotempty = false) {
         }
         if (!is_object($section)) {
             $section = $DB->get_record('course_sections', array('course' => $this->get_courseid(), 'section' => $section),
-                'id,section,sequence');
+                'id,section,sequence,summary');
         }
         if (!$section || !$section->section) {
             // Not possible to delete 0-section.
             return false;
         }
 
-        if (!$forcedeleteifnotempty && !empty($section->sequence)) {
+        if (!$forcedeleteifnotempty && (!empty($section->sequence) || !empty($section->summary))) {
             return false;
         }