MDL-18293 removed obsoleted checking of return values from insert and update_record...

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index fb3e924f7f18803779060bc1eff67c36f7b23a6d..cf83619313ef345bdf066457090b9d432a301d8b 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -210,18 +210,14 @@ class auth_plugin_mnet extends auth_plugin_base {
             $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout;
             $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime');
             $mnet_session->session_id = session_id();
-            if (! $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session)) {
-                print_error('databaseerror', 'mnet');
-            }
+            $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session);
         } else {
             $mnet_session->useragent = sha1($_SERVER['HTTP_USER_AGENT']);
             $mnet_session->token = $this->generate_token();
             $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout;
             $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime');
             $mnet_session->session_id = session_id();
-            if (false == $DB->update_record('mnet_session', $mnet_session)) {
-                print_error('databaseerror', 'mnet');
-            }
+            $DB->update_record('mnet_session', $mnet_session);
         }
 
         // construct the redirection URL
@@ -299,9 +295,7 @@ class auth_plugin_mnet extends auth_plugin_base {
                 print_error('nolocaluser', 'mnet');
             }
             $remoteuser->mnethostid = $remotehost->id;
-            if (! $DB->insert_record('user', $remoteuser)) {
-                print_error('databaseerror', 'mnet');
-            }
+            $DB->insert_record('user', $remoteuser);
             $firsttime = true;
             if (! $localuser = $DB->get_record('user', array('username'=>$remoteuser->username, 'mnethostid'=>$remotehost->id))) {
                 print_error('nolocaluser', 'mnet');
@@ -390,9 +384,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             $mnet_session->confirm_timeout = time();
             $mnet_session->expires = time() + (integer)$session_gc_maxlifetime;
             $mnet_session->session_id = session_id();
-            if (! $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session)) {
-                print_error('databaseerror', 'mnet');
-            }
+            $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session);
         } else {
             $mnet_session->expires = time() + (integer)$session_gc_maxlifetime;
             $DB->update_record('mnet_session', $mnet_session);

diff --git a/lang/en_utf8/hotpot.php b/lang/en_utf8/hotpot.php
index 5b0bb345ca1d50c4cdeee56b62f41754cf7bc955..070dc4bfa504ab399f96bd6d59f6ae3726f90daf 100644 (file)
--- a/lang/en_utf8/hotpot.php
+++ b/lang/en_utf8/hotpot.php
@@ -15,7 +15,6 @@ $string['cannotaddquestionrecord'] = 'Could not add question record';
 $string['cannotaddresprecord'] = 'Could not add response record';
 $string['cannotaddstrrecord'] = 'Could not add string record';
 $string['cannotfindmethod'] = 'Template block expand method not found: ($a)';
-$stirng['cannotinsertattempt'] = 'Could not insert attempt record: $a';
 $string['checks'] = 'Checks';
 $string['clickreporting'] = 'Enable click reporting';
 $string['clues'] = 'Clues';

diff --git a/mod/data/import.php b/mod/data/import.php
index b665814ef3f50b633573f59dbb8623779f7ebe7d..b802154ef7c9971f6b67053218b262ca4c51d1b8 100755 (executable)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -128,9 +128,7 @@
                         $content = new object();
                         $content->recordid = $recordid;
                         $content->fieldid = $field->id;
-                        if (! $DB->insert_record('data_content', $content)) {
-                            print_error('cannotinsertrecord', '', '', $recordid);
-                        }
+                        $DB->insert_record('data_content', $content);
                     }
                     // Fill data_content with the values imported from the CSV file:
                     foreach ($record as $key => $value) {

diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php
index 44c4fc4dab5b042c5b2ba76ed42cb5546cb25059..a1aeb64133cd4bcb6080aa0cc0464600331a637a 100644 (file)
--- a/mod/data/restorelib.php
+++ b/mod/data/restorelib.php
@@ -387,9 +387,7 @@ function data_ratings_restore_mods ($oldid, $newid, $info, $rec_info) {
         $rating -> userid = backup_todb($rat_info['#']['USERID']['0']['#']);
         $rating -> rating = backup_todb($rat_info['#']['RATING']['0']['#']);
 
-        if (! $DB->insert_record ("data_ratings",$rating)) {
-            $status = false;
-        }
+        $DB->insert_record("data_ratings", $rating);
     }
     return $status;
 }
@@ -414,10 +412,7 @@ function data_comments_restore_mods ($oldid, $newid, $info, $rec_info) {
         $comment -> content = backup_todb($com_info['#']['CONTENT']['0']['#']);
         $comment -> created = backup_todb($com_info['#']['CREATED']['0']['#']);
         $comment -> modified = backup_todb($com_info['#']['MODIFIED']['0']['#']);
-        if (! $DB->insert_record ("data_comments",$comment)) {
-            $status = false;
-        }
-
+        $DB->insert_record("data_comments", $comment);
     }
     return $status;
 

diff --git a/mod/hotpot/attempt.php b/mod/hotpot/attempt.php
index 8fab8e96781220f4a21ff0597d1d6d641b642803..5cf79bd659296f5e4fb5eb2e602e2e1635f5497e 100644 (file)
--- a/mod/hotpot/attempt.php
+++ b/mod/hotpot/attempt.php
@@ -81,18 +81,12 @@
             unset ($attempt->id);
             $attempt->id = $DB->insert_record("hotpot_attempts", $attempt);
 
-            if (empty($attempt->id)) {
-                print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error());
-            }
-
             // add attempt details record, if necessary
             if (!empty($attempt->details)) {
                 $details = new object();
                 $details->attempt = $attempt->id;
                 $details->details = $attempt->details;
-                if (! $DB->insert_record("hotpot_details", $details, false)) {
-                    print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error());
-                }
+                $DB->insert_record("hotpot_details", $details, false);
             }
         } else {
             // remove previous responses for this attempt, if required
@@ -131,9 +125,7 @@
             $details = new object();
             $details->attempt = $attempt->id;
             $details->details = $attempt->details;
-            if (! $DB->insert_record("hotpot_details", $details)) {
-                print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error());
-            }
+            $DB->insert_record("hotpot_details", $details);
         }
     }
 

diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 909a2aefd635122e864e3020792dced8463cc5a4..5efd2b34d3fd7c7d20f3cda187732d0b77a75be0 100644 (file)
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -145,9 +145,6 @@
                 add_to_log($course->id, "hotpot", "view", "view.php?id=$cm->id", "$hotpot->id", "$cm->id");
 
                 $attemptid = hotpot_add_attempt($hotpot->id);
-                if (! is_numeric($attemptid)) {
-                    print_error('cannotinsertattempt', 'hotpot', '', $DB->get_last_error());
-                }
             }
             $hp->adjust_media_urls();
             if (empty($frameset)) {

diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php
index e08a90826b19550cca70a8055421c60f0da328cb..45886361a231cc27630c30c8854905cad714e2f6 100644 (file)
--- a/question/type/numerical/questiontype.php
+++ b/question/type/numerical/questiontype.php
@@ -207,10 +207,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
                 $units[$i]->question = $question->id;
                 $units[$i]->multiplier = $this->apply_unit($question->multiplier[$i], array());
                 $units[$i]->unit = $question->unit[$i];
-                if (! $DB->insert_record('question_numerical_units', $units[$i])) {
-                    $result->error = 'Unable to save unit ' . $units[$i]->unit . ' to the Databse';
-                    return $result;
-                }
+                $DB->insert_record('question_numerical_units', $units[$i]);
             }
         }
         unset($question->multiplier, $question->unit);