From 2fc13bc767fe89dec75eb42f7cb9c8d69569b84e Mon Sep 17 00:00:00 2001
From: mark-nielsen <mark-nielsen>
Date: Fri, 25 Aug 2006 18:33:50 +0000
Subject: [PATCH] Merged differences from MOODLE_16_STABLE into HEAD

---
 mod/lesson/action/insertpage.php | 2 +-
 mod/lesson/action/updatepage.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/lesson/action/insertpage.php b/mod/lesson/action/insertpage.php
index d6533a6382..9643b80b69 100644
--- 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 c4f053ad24..e0376bb9e8 100644
--- 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");
-- 
2.39.5