Merged differences from MOODLE_16_STABLE into HEAD

diff --git a/mod/lesson/action/insertpage.php b/mod/lesson/action/insertpage.php
index d6533a638283ef4b027cee5828b2dd396d718787..9643b80b69644b3fb3a70aa518a0182eed6e2391 100644 (file)
--- a/mod/lesson/action/insertpage.php
+++ b/mod/lesson/action/insertpage.php
@@ -148,7 +148,7 @@
             $lesson->maxanswers = $lesson->maxanswers + 2;
         }
         for ($i = 0; $i < $lesson->maxanswers; $i++) {
-            if (trim(strip_tags($form->answer[$i]))) { // strip_tags because the HTML editor adds <p><br />...
+            if (!empty($form->answer[$i]) and trim(strip_tags($form->answer[$i]))) { // strip_tags because the HTML editor adds <p><br />...
                 $newanswer->lessonid = $lesson->id;
                 $newanswer->pageid = $newpageid;
                 $newanswer->timecreated = $timenow;

diff --git a/mod/lesson/action/updatepage.php b/mod/lesson/action/updatepage.php
index c4f053ad241f57af91514d3bb83155d0ab9e680f..e0376bb9e82ca80dc94f9a0f87f8f1ae88b33e16 100644 (file)
--- a/mod/lesson/action/updatepage.php
+++ b/mod/lesson/action/updatepage.php
@@ -83,7 +83,7 @@
         for ($i = 0; $i < $lesson->maxanswers; $i++) {
             // strip tags because the editor gives <p><br />...
             // also save any answers where the editor is (going to be) used
-            if (trim(strip_tags($form->answer[$i])) or isset($form->answereditor[$i]) or isset($form->responseeditor[$i])) {
+            if ((!empty($form->answer[$i]) and trim(strip_tags($form->answer[$i]))) or isset($form->answereditor[$i]) or isset($form->responseeditor[$i])) {
                 if ($form->answerid[$i]) {
                     $oldanswer = new stdClass;
                     $oldanswer->id = clean_param($form->answerid[$i], PARAM_INT);
@@ -162,7 +162,7 @@
                             error("Update page: answer $i not updated");
                         }
                     }                        
-                } elseif ($form->answerid[$i]) {
+                } elseif (!empty($form->answerid[$i])) {
                     // need to delete blanked out answer
                     if (!delete_records("lesson_answers", "id", clean_param($form->answerid[$i], PARAM_INT))) {
                         error("Update page: unable to delete answer record");