From b78267b6419155a2fe8b7f8b462eb73cf2588711 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 5 May 2009 09:00:24 +0000
Subject: [PATCH] MDL-19067 removed obsoleted string (never used in any STABLE
 branch)

---
 lang/en_utf8/error.php           |  1 -
 lang/en_utf8/lesson.php          |  1 -
 mod/glossary/editcategories.php  |  9 ++-------
 mod/lesson/action/updatepage.php | 12 +++---------
 mod/lesson/view.php              |  4 +---
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 676b006614..aae3df3732 100644
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -83,7 +83,6 @@ $string['cannothaveparentcate'] = 'Course category cannot have parent!';
 $string['cannotimport'] = 'Import error';
 $string['cannotimportgrade'] = 'Grade import error';
 $string['cannotimportformat'] = 'Sorry, importing this format is not yet implemented!';
-$string['cannotinsertcategory'] = 'Weird error. The category was not inserted.';
 $string['cannotinsertgrade'] = 'Cannot insert grade item without course id!';
 $string['cannotinsertrate'] = 'Could not insert a new rating ($a->id = $a->rating)';
 $string['cannotinsertrecord'] = 'Could not insert new record ID $a';
diff --git a/lang/en_utf8/lesson.php b/lang/en_utf8/lesson.php
index 1f6b5a618f..55776f9179 100644
--- a/lang/en_utf8/lesson.php
+++ b/lang/en_utf8/lesson.php
@@ -56,7 +56,6 @@ $string['cannotdeleteattempt'] = 'Error: could not delete old attempts';
 $string['cannotdeletebranch'] = 'Error: could not delete old seen branches';
 $string['cannotinsertanswer'] = 'Cannot insert answer record';
 $string['cannotinserthighscore'] = 'Insert of new high score Failed!';
-$string['cannotinsertgrade'] = 'Cannot insert grade';
 $string['cannotinsertpage'] = 'Cannot insert new page';
 $string['cannotinserttimer'] = 'Error: could not insert row into lesson_timer table';
 $string['cannotupdateanswer'] = 'Update page: answer not updated';
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 0213c0a0a5..871989f221 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -156,13 +156,8 @@
                 $cat->usedynalink = $usedynalink;
                 $cat->glossaryid = $glossary->id;
 
-                if ( ! $cat->id = $DB->insert_record("glossary_categories", $cat) ) {
-                    print_error('cannotinsertcategory');
-
-                    redirect("editcategories.php?id=$cm->id");
-                } else {
-                    add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id);
-                }
+                $cat->id = $DB->insert_record("glossary_categories", $cat);
+                add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id);
             }
         } else {
             echo "<p style=\"text-align:center\">" . get_string("add"). " " . get_string("category","glossary"). "</p>";
diff --git a/mod/lesson/action/updatepage.php b/mod/lesson/action/updatepage.php
index c22a307875..5b02737544 100644
--- a/mod/lesson/action/updatepage.php
+++ b/mod/lesson/action/updatepage.php
@@ -66,9 +66,7 @@
         if ($answers = $DB->get_records_select("lesson_answers", "pageid = :pageid", $params)) {
             foreach ($answers as $answer) {
                 if ($answer->id != clean_param($form->answerid[0], PARAM_INT)) {
-                    if (!$DB->delete_records("lesson_answers", array("id" => $answer->id))) {
-                        print_error('cannotdeleteanswer', 'lesson');
-                    }
+                    $DB->delete_records("lesson_answers", array("id" => $answer->id));
                 }
             }
         }        
@@ -142,9 +140,7 @@
                     if ($i >= 2) {
                         if ($form->answerid[$i]) {
                             // need to delete blanked out answer
-                            if (!$DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)))) {
-                                print_error('cannotdeleteanswer', 'lesson');
-                            }
+                            $DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)));
                         }
                     } else {
                         $oldanswer = new stdClass;
@@ -165,9 +161,7 @@
                     }                        
                 } elseif (!empty($form->answerid[$i])) {
                     // need to delete blanked out answer
-                    if (!$DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)))) {
-                        print_error('cannotdeleteanswer', 'lesson');
-                    }
+                    $DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)));
                 }
             }
         }
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 6db1be901a..3d372394c8 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -907,9 +907,7 @@
                             print_error('cannotupdategrade', 'lesson');
                         }
                     } else {
-                        if (!$newgradeid = $DB->insert_record("lesson_grades", $grade)) {
-                            print_error('cannotinsertgrade', 'lesson');
-                        }
+                        $newgradeid = $DB->insert_record("lesson_grades", $grade);
                     }
                 } else {
                     if (!$DB->delete_records("lesson_attempts", array("lessonid" => $lesson->id, "userid" => $USER->id, "retry" => $ntries))) {
-- 
2.39.5