From 739ee4e679d97bc9810c77d676ad5fcd7b865102 Mon Sep 17 00:00:00 2001 From: skodak Date: Tue, 5 May 2009 09:05:27 +0000 Subject: [PATCH] MDL-19067 removed obsoleted string (never used in any STABLE branch) --- mod/lesson/action/addcluster.php | 4 +--- mod/lesson/action/addendofbranch.php | 4 +--- mod/lesson/action/addendofcluster.php | 4 +--- mod/lesson/action/insertpage.php | 9 --------- mod/lesson/action/updatepage.php | 3 --- mod/lesson/importppt.php | 4 +--- mod/lesson/view.php | 20 +++++--------------- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/mod/lesson/action/addcluster.php b/mod/lesson/action/addcluster.php index e2ed47da33..c67d0aeb8b 100644 --- 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 1419094a68..e29d127624 100644 --- 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 be6a346a8f..2dcc30c48d 100644 --- 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 63a6d3b4fd..f8aa3ac7ae 100644 --- 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 5b02737544..d42375cef0 100644 --- 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 8f6a428767..44662e3094 100644 --- 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 3d372394c8..590a82b8c9 100644 --- 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"); } -- 2.39.5