MDL-19067 removed obsoleted string (never used in any STABLE branch)

diff --git a/mod/lesson/action/addcluster.php b/mod/lesson/action/addcluster.php
index e2ed47da33808124ae0c746ea9654754e80cf3a4..c67d0aeb8bf8bfe5ca500fe035abeaeea8605fcc 100644 (file)
--- a/mod/lesson/action/addcluster.php
+++ b/mod/lesson/action/addcluster.php
@@ -60,9 +60,7 @@
     $newanswer->pageid = $newpageid;
     $newanswer->timecreated = $timenow;
     $newanswer->jumpto = LESSON_CLUSTERJUMP;
-    if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-        print_error('cannotinsertanswer', 'lesson');
-    }
+    $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
     lesson_set_message(get_string('addedcluster', 'lesson'), 'notifysuccess');
     redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
 ?>

diff --git a/mod/lesson/action/addendofbranch.php b/mod/lesson/action/addendofbranch.php
index 1419094a6866d55e885e480cb163828221f9309d..e29d127624eb980df120b2021fa963fc2c461299 100644 (file)
--- a/mod/lesson/action/addendofbranch.php
+++ b/mod/lesson/action/addendofbranch.php
@@ -56,9 +56,7 @@
         $newanswer->pageid = $newpageid;
         $newanswer->timecreated = $timenow;
         $newanswer->jumpto = $btpageid;
-        if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-            print_error('cannotinsertanswer', 'lesson');
-        }
+        $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
         
         lesson_set_message(get_string('addedanendofbranch', 'lesson'), 'notifysuccess');
     } else {

diff --git a/mod/lesson/action/addendofcluster.php b/mod/lesson/action/addendofcluster.php
index be6a346a8f843aa8c587329673aa010f96650d85..2dcc30c48d6d2e393bbd289c9c9f045f364cff7c 100644 (file)
--- a/mod/lesson/action/addendofcluster.php
+++ b/mod/lesson/action/addendofcluster.php
@@ -47,8 +47,6 @@
     $newanswer->pageid = $newpageid;
     $newanswer->timecreated = $timenow;
     $newanswer->jumpto = LESSON_NEXTPAGE;
-    if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-        print_error('cannotinsertanswer', 'lesson');
-    }
+    $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
     lesson_set_message(get_string('addedendofcluster', 'lesson'), 'notifysuccess');
     redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");

diff --git a/mod/lesson/action/insertpage.php b/mod/lesson/action/insertpage.php
index 63a6d3b4fd3a289d7a9b94b070edb290b80a59a3..f8aa3ac7aed36f1bdd21c4595aab04c66cf8c291 100644 (file)
--- a/mod/lesson/action/insertpage.php
+++ b/mod/lesson/action/insertpage.php
@@ -140,9 +140,6 @@
             $newanswer->score = clean_param($form->score[0], PARAM_INT);
         }
         $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
-        if (!$newanswerid) {
-            print_error('cannotinsertanswer', 'lesson');
-        }
     } else {
         if ($form->qtype == LESSON_MATCHING) {
             // need to add two to offset correct response and wrong response
@@ -166,9 +163,6 @@
                     }
                 }
                 $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
-                if (!$newanswerid) {
-                    print_error('cannotinsertanswer', 'lesson');
-                }
             } else {
                 if ($form->qtype == LESSON_MATCHING) {
                     if ($i < 2) {
@@ -176,9 +170,6 @@
                         $newanswer->pageid = $newpageid;
                         $newanswer->timecreated = $timenow;
                         $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
-                        if (!$newanswerid) {
-                            print_error('cannotinsertanswer', 'lesson');
-                        }
                     }
                 } else {
                     break;

diff --git a/mod/lesson/action/updatepage.php b/mod/lesson/action/updatepage.php
index 5b02737544a1d915d25146f70f6b10c46b39397a..d42375cef02a19ce11a36426d405d30b91c7f398 100644 (file)
--- a/mod/lesson/action/updatepage.php
+++ b/mod/lesson/action/updatepage.php
@@ -131,9 +131,6 @@
                         $newanswer->score = clean_param($form->score[$i], PARAM_INT);
                     }
                     $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
-                    if (!$newanswerid) {
-                        print_error('cannotinsertanswer', 'lesson');
-                    }
                 }
             } else {
                  if ($form->qtype == LESSON_MATCHING) {

diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index 8f6a4287673a23c976ca85e4201c36e7b1a944ad..44662e309412a21dbfb65881eada42ffae923aaf 100644 (file)
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -557,9 +557,7 @@ function lesson_save_objects($branchtables, $lessonid, $after) {
         // insert the answers
         foreach ($branchtable->answers as $answer) {
             $answer->pageid = $id;
-            if(!$DB->insert_record('lesson_answers', $answer)) {
-                print_error('cannotinsertanswer', 'lesson');
-            }
+            $DB->insert_record('lesson_answers', $answer);
         }
         
         $prevpageid = $id;

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 3d372394c8f89b33baa751f6a886998784d4aef2..590a82b8c9103fce4c08a1bb19b3f3628465e96f 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -345,12 +345,8 @@
                 } else {
                     $retries = 0;
                 }
-                if (!$DB->delete_records('lesson_attempts', array('userid' => $USER->id, 'lessonid' => $lesson->id, 'retry' => $retries))) {
-                    print_error('cannotdeleteattempt', 'lesson');
-                }
-                if (!$DB->delete_records('lesson_branch', array('userid' => $USER->id, 'lessonid' => $lesson->id, 'retry' => $retries))) {
-                    print_error('cannotdeletebranch', 'lesson');
-                }
+                $DB->delete_records('lesson_attempts', array('userid' => $USER->id, 'lessonid' => $lesson->id, 'retry' => $retries));
+                $DB->delete_records('lesson_branch', array('userid' => $USER->id, 'lessonid' => $lesson->id, 'retry' => $retries));
             }
         }
         
@@ -903,16 +899,12 @@
                         }
                         $oldgrade = end($grades);
                         $grade->id = $oldgrade->id;
-                        if (!$update = $DB->update_record("lesson_grades", $grade)) {
-                            print_error('cannotupdategrade', 'lesson');
-                        }
+                        $DB->update_record("lesson_grades", $grade);
                     } else {
                         $newgradeid = $DB->insert_record("lesson_grades", $grade);
                     }
                 } else {
-                    if (!$DB->delete_records("lesson_attempts", array("lessonid" => $lesson->id, "userid" => $USER->id, "retry" => $ntries))) {
-                        print_error('cannotdeleteattempt', 'lesson');
-                    }
+                    $DB->delete_records("lesson_attempts", array("lessonid" => $lesson->id, "userid" => $USER->id, "retry" => $ntries));
                 }
             } else {
                 if ($lesson->timed) {
@@ -923,9 +915,7 @@
                         $grade->grade = 0;
                         $grade->completed = time();
                         if (!$lesson->practice) {
-                            if (!$newgradeid = $DB->insert_record("lesson_grades", $grade)) {
-                                print_error('cannotinsertgrade', 'lesson');
-                            }
+                            $newgradeid = $DB->insert_record("lesson_grades", $grade);
                         }
                         echo get_string("eolstudentoutoftimenoanswers", "lesson");
                     }