From dd88de0ebd9d58828d19e62dd1d26e21ae1e4f5f Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 3 Sep 2010 18:01:25 +0000 Subject: [PATCH] MDL-14679 fixed remaining old style update_record()s --- admin/xmldb/actions/test/test.class.php | 37 +++--- auth/db/auth.php | 7 +- auth/ldap/auth.php | 14 +-- blog/external_blog_edit.php | 5 +- .../type/upload/assignment.class.php | 106 +++++++----------- mod/chat/lib.php | 21 ++-- mod/data/restorelib.php | 6 +- mod/data/templates.php | 5 +- mod/data/view.php | 7 +- mod/feedback/item/label/lib.php | 6 +- mod/forum/db/upgrade.php | 5 +- mod/forum/lib.php | 5 +- mod/glossary/db/upgrade.php | 5 +- mod/glossary/lib.php | 4 +- mod/quiz/restorelib.php | 4 +- mod/quiz/restorelibpre15.php | 2 +- mod/scorm/aicc.php | 2 +- mod/scorm/datamodels/aicclib.php | 5 +- mod/scorm/locallib.php | 5 +- mod/workshop/db/upgrade.php | 5 +- question/restorelib.php | 4 +- question/type/shortanswer/questiontype.php | 2 +- user/profile/definelib.php | 5 +- 23 files changed, 110 insertions(+), 157 deletions(-) diff --git a/admin/xmldb/actions/test/test.class.php b/admin/xmldb/actions/test/test.class.php index ba7590f32f4..44317de8d0e 100644 --- a/admin/xmldb/actions/test/test.class.php +++ b/admin/xmldb/actions/test/test.class.php @@ -1024,27 +1024,24 @@ class test extends XMLDBAction { /// Calculate its length $textlen = $textlib->strlen($basetext); $imglen = strlen($basetext); - if ($DB->update_record('newnameforthetable', $rec)) { - if ($new = $DB->get_record('newnameforthetable', array('id'=>$rec->id))) { - $newtextlen = $textlib->strlen($new->intro); - $newimglen = strlen($new->avatar); - if ($basetext === $new->avatar && $basetext === $new->intro) { - $test->sql = array($newtextlen . ' cc. (text) sent and received ok', - $newimglen . ' bytes (binary) sent and received ok'); - $test->status = true; - } else { - if ($rec->avatar !== $new->avatar) { - $test->error = $DB->get_last_error(); - $test->sql = array($newimglen . ' bytes (binary) transfer failed. Data changed!'); - $test->status = false; - } else { - $test->error = $DB->get_last_error(); - $test->sql = array($newtextlen . ' cc. (text) transfer failed. Data changed!'); - $test->status = false; - } - } + $DB->update_record('newnameforthetable', $rec); + if ($new = $DB->get_record('newnameforthetable', array('id'=>$rec->id))) { + $newtextlen = $textlib->strlen($new->intro); + $newimglen = strlen($new->avatar); + if ($basetext === $new->avatar && $basetext === $new->intro) { + $test->sql = array($newtextlen . ' cc. (text) sent and received ok', + $newimglen . ' bytes (binary) sent and received ok'); + $test->status = true; } else { - $test->error = $DB->get_last_error(); + if ($rec->avatar !== $new->avatar) { + $test->error = $DB->get_last_error(); + $test->sql = array($newimglen . ' bytes (binary) transfer failed. Data changed!'); + $test->status = false; + } else { + $test->error = $DB->get_last_error(); + $test->sql = array($newtextlen . ' cc. (text) transfer failed. Data changed!'); + $test->status = false; + } } } else { $test->error = $DB->get_last_error(); diff --git a/auth/db/auth.php b/auth/db/auth.php index ada64064116..8bd50daa209 100644 --- a/auth/db/auth.php +++ b/auth/db/auth.php @@ -263,11 +263,8 @@ class auth_plugin_db extends auth_plugin_base { $updateuser = new object(); $updateuser->id = $user->id; $updateuser->auth = 'nologin'; - if ($DB->update_record('user', $updateuser)) { - echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; - } else { - echo "\t"; print_string('auth_dbsuspendusererror', 'auth_db', $user->username); echo "\n"; - } + $DB->update_record('user', $updateuser); + echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; } } } diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php index ce5ca113c1f..5533439c97f 100644 --- a/auth/ldap/auth.php +++ b/auth/ldap/auth.php @@ -715,11 +715,8 @@ class auth_plugin_ldap extends auth_plugin_base { $updateuser = new object(); $updateuser->id = $user->id; $updateuser->auth = 'nologin'; - if ($DB->update_record('user', $updateuser)) { - echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; - } else { - echo "\t"; print_string('auth_dbsuspendusererror', 'auth_db', $user->username); echo "\n"; - } + $DB->update_record('user', $updateuser); + echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; } } } else { @@ -743,11 +740,8 @@ class auth_plugin_ldap extends auth_plugin_base { $updateuser = new object(); $updateuser->id = $user->id; $updateuser->auth = $this->authtype; - if ($DB->update_record('user', $updateuser)) { - echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; - } else { - echo "\t"; print_string('auth_dbrevivedusererror', 'auth_db', $user->username); echo "\n"; - } + $DB->update_record('user', $updateuser); + echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n"; } } else { print_string('nouserentriestorevive', 'auth_ldap'); diff --git a/blog/external_blog_edit.php b/blog/external_blog_edit.php index 42cb3ed246b..0e936f98c0f 100644 --- a/blog/external_blog_edit.php +++ b/blog/external_blog_edit.php @@ -101,9 +101,8 @@ if ($externalblogform->is_cancelled()){ $external->filtertags = $data->filtertags; $external->timemodified = mktime(); - if ($DB->update_record('blog_external', $external)) { - tag_set('blog_external', $external->id, explode(',', $data->autotags)); - } + $DB->update_record('blog_external', $external); + tag_set('blog_external', $external->id, explode(',', $data->autotags)); } else { print_error('wrongexternalid', 'blog'); diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index d7a29555b72..3d137530aca 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -476,19 +476,11 @@ class assignment_upload extends assignment_base { $updated->timemodified = time(); $updated->data1 = $data->text; - if ($DB->update_record('assignment_submissions', $updated)) { - add_to_log($this->course->id, 'assignment', 'upload', 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); - redirect($returnurl); - $submission = $this->get_submission($USER->id); - $this->update_grade($submission); - - } else { - $this->view_header(get_string('notes', 'assignment')); - echo $OUTPUT->notification(get_string('notesupdateerror', 'assignment')); - echo $OUTPUT->continue_button($returnurl); - $this->view_footer(); - die; - } + $DB->update_record('assignment_submissions', $updated); + add_to_log($this->course->id, 'assignment', 'upload', 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); + redirect($returnurl); + $submission = $this->get_submission($USER->id); + $this->update_grade($submission); } /// show notes edit form @@ -550,28 +542,27 @@ class assignment_upload extends assignment_base { $updates = new object(); $updates->id = $submission->id; $updates->timemodified = time(); - if ($DB->update_record('assignment_submissions', $updates)) { - add_to_log($this->course->id, 'assignment', 'upload', - 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); - $this->update_grade($submission); - if (!$this->drafts_tracked()) { - $this->email_teachers($submission); - } - - // send files to event system - $files = $fs->get_area_files($this->context->id, 'mod_assignment', 'submission', $submission->id); - // Let Moodle know that assessable files were uploaded (eg for plagiarism detection) - $eventdata = new object(); - $eventdata->modulename = 'assignment'; - $eventdata->cmid = $this->cm->id; - $eventdata->itemid = $submission->id; - $eventdata->courseid = $this->course->id; - $eventdata->userid = $USER->id; - if ($files) { - $eventdata->files = $files; - } - events_trigger('assessable_file_uploaded', $eventdata); + $DB->update_record('assignment_submissions', $updates); + add_to_log($this->course->id, 'assignment', 'upload', + 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); + $this->update_grade($submission); + if (!$this->drafts_tracked()) { + $this->email_teachers($submission); } + + // send files to event system + $files = $fs->get_area_files($this->context->id, 'mod_assignment', 'submission', $submission->id); + // Let Moodle know that assessable files were uploaded (eg for plagiarism detection) + $eventdata = new object(); + $eventdata->modulename = 'assignment'; + $eventdata->cmid = $this->cm->id; + $eventdata->itemid = $submission->id; + $eventdata->courseid = $this->course->id; + $eventdata->userid = $USER->id; + if ($files) { + $eventdata->files = $files; + } + events_trigger('assessable_file_uploaded', $eventdata); $returnurl = new moodle_url('/mod/assignment/view.php', array('id'=>$this->cm->id)); redirect($returnurl); } @@ -670,19 +661,12 @@ class assignment_upload extends assignment_base { $updated->data2 = ASSIGNMENT_STATUS_SUBMITTED; $updated->timemodified = time(); - if ($DB->update_record('assignment_submissions', $updated)) { - add_to_log($this->course->id, 'assignment', 'upload', //TODO: add finalize action to log - 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); - $submission = $this->get_submission($userid); - $this->update_grade($submission); - $this->email_teachers($submission); - } else { - $this->view_header(get_string('submitformarking', 'assignment')); - echo $OUTPUT->notification(get_string('finalizeerror', 'assignment')); - echo $OUTPUT->continue_button($returnurl); - $this->view_footer(); - die; - } + $DB->update_record('assignment_submissions', $updated); + add_to_log($this->course->id, 'assignment', 'upload', //TODO: add finalize action to log + 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); + $submission = $this->get_submission($userid); + $this->update_grade($submission); + $this->email_teachers($submission); // Trigger assessable_files_done event to show files are complete $eventdata = new object(); @@ -717,12 +701,11 @@ class assignment_upload extends assignment_base { $updated->id = $submission->id; $updated->data2 = ASSIGNMENT_STATUS_CLOSED; - if ($DB->update_record('assignment_submissions', $updated)) { - add_to_log($this->course->id, 'assignment', 'upload', //TODO: add finalize action to log - 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); - $submission = $this->get_submission($userid, false, true); - $this->update_grade($submission); - } + $DB->update_record('assignment_submissions', $updated); + add_to_log($this->course->id, 'assignment', 'upload', //TODO: add finalize action to log + 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id); + $submission = $this->get_submission($userid, false, true); + $this->update_grade($submission); redirect($returnurl); } @@ -745,18 +728,11 @@ class assignment_upload extends assignment_base { $updated = new object(); $updated->id = $submission->id; $updated->data2 = ''; - if ($DB->update_record('assignment_submissions', $updated)) { - //TODO: add unfinalize action to log - add_to_log($this->course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id); - $submission = $this->get_submission($userid); - $this->update_grade($submission); - } else { - $this->view_header(get_string('submitformarking', 'assignment')); - echo $OUTPUT->notification(get_string('unfinalizeerror', 'assignment')); - echo $OUTPUT->continue_button($returnurl); - $this->view_footer(); - die; - } + $DB->update_record('assignment_submissions', $updated); + //TODO: add unfinalize action to log + add_to_log($this->course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id); + $submission = $this->get_submission($userid); + $this->update_grade($submission); } if ($forcemode==null) { diff --git a/mod/chat/lib.php b/mod/chat/lib.php index a11938d4093..2f7773f3900 100644 --- a/mod/chat/lib.php +++ b/mod/chat/lib.php @@ -136,7 +136,7 @@ function chat_add_instance($chat) { * * @global object * @param object $chat - * @return int + * @return bool */ function chat_update_instance($chat) { global $DB; @@ -145,22 +145,21 @@ function chat_update_instance($chat) { $chat->id = $chat->instance; - if ($returnid = $DB->update_record("chat", $chat)) { + $DB->update_record("chat", $chat); - $event = new object(); + $event = new object(); - if ($event->id = $DB->get_field('event', 'id', array('modulename'=>'chat', 'instance'=>$chat->id))) { + if ($event->id = $DB->get_field('event', 'id', array('modulename'=>'chat', 'instance'=>$chat->id))) { - $event->name = $chat->name; - $event->description = format_module_intro('chat', $chat, $chat->coursemodule); - $event->timestart = $chat->chattime; + $event->name = $chat->name; + $event->description = format_module_intro('chat', $chat, $chat->coursemodule); + $event->timestart = $chat->chattime; - $calendarevent = calendar_event::load($event->id); - $calendarevent->update($event); - } + $calendarevent = calendar_event::load($event->id); + $calendarevent->update($event); } - return $returnid; + return true; } /** diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php index 02c8d300891..efcd37fe1a9 100644 --- a/mod/data/restorelib.php +++ b/mod/data/restorelib.php @@ -616,7 +616,7 @@ function data_decode_content_links_caller($restore) { /// Update record if any field changed if($changed) { - $status = $DB->update_record("data",$newdata); + $DB->update_record("data",$newdata); } /// Do some output @@ -650,7 +650,7 @@ function data_decode_content_links_caller($restore) { if ($result != $content) { /// Update record $comment->content = $result; - $status = $DB->update_record("data_comments",$comment); + $DB->update_record("data_comments",$comment); if (debugging()) { if (!defined('RESTORE_SILENTLY')) { echo '
'.s($content).'
changed to
'.s($result).'

'; @@ -718,7 +718,7 @@ function data_decode_content_links_caller($restore) { $cnt->content4 = $result4; } /// Update record with the changed fields - $status = $DB->update_record("data_content",$cnt); + $DB->update_record("data_content",$cnt); if (debugging()) { if (!defined('RESTORE_SILENTLY')) { echo '
'.s($content).'
changed to
'.s($result).'

'; diff --git a/mod/data/templates.php b/mod/data/templates.php index e4d5f0c8262..1c89b6d6088 100755 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -136,9 +136,8 @@ if (($mytemplate = data_submitted()) && confirm_sesskey()) { // Check for multiple tags, only need to check for add template. if ($mode != 'addtemplate' or data_tags_check($data->id, $newtemplate->{$mode})) { - if ($DB->update_record('data', $newtemplate)) { - echo $OUTPUT->notification(get_string('templatesaved', 'data'), 'notifysuccess'); - } + $DB->update_record('data', $newtemplate); + echo $OUTPUT->notification(get_string('templatesaved', 'data'), 'notifysuccess'); } add_to_log($course->id, 'data', 'templates saved', "templates.php?id=$cm->id&d=$data->id", $data->id, $cm->id); } diff --git a/mod/data/view.php b/mod/data/view.php index 044b52c0f94..a4bf19f7b4c 100755 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -295,7 +295,7 @@ $PAGE->set_title($title); $PAGE->set_heading($course->fullname); - + echo $OUTPUT->header(); /// Check to see if groups are being used here @@ -407,9 +407,8 @@ if ($showactivity) { if ($approverecord->dataid == $data->id) { // Must be from this database $newrecord->id = $approverecord->id; $newrecord->approved = 1; - if ($DB->update_record('data_records', $newrecord)) { - echo $OUTPUT->notification(get_string('recordapproved','data'), 'notifysuccess'); - } + $DB->update_record('data_records', $newrecord); + echo $OUTPUT->notification(get_string('recordapproved','data'), 'notifysuccess'); } } } diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php index a6ac70b0c91..b820fc36881 100644 --- a/mod/feedback/item/label/lib.php +++ b/mod/feedback/item/label/lib.php @@ -208,10 +208,8 @@ class feedback_item_label extends feedback_item_base { // $item = new object(); // $item->id = $data->id - if($DB->update_record('feedback_item', $item)) { - return $item->id; - } - return false; + $DB->update_record('feedback_item', $item); + return $item->id; } function get_hasvalue() { diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php index 1e4ab2731b1..2abd977524a 100644 --- a/mod/forum/db/upgrade.php +++ b/mod/forum/db/upgrade.php @@ -136,9 +136,8 @@ function xmldb_forum_upgrade($oldversion) { $file_record = array('contextid'=>$context->id, 'component'=>'mod_form', 'filearea'=>$filearea, 'itemid'=>$post->id, 'filepath'=>'/', 'filename'=>$filename, 'userid'=>$post->userid); if ($fs->create_file_from_pathname($file_record, $filepath)) { $post->attachment = '1'; - if ($DB->update_record('forum_posts', $post)) { - unlink($filepath); - } + $DB->update_record('forum_posts', $post); + unlink($filepath); } } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 3033944e02c..ab88df0e5e6 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -6762,9 +6762,8 @@ function forum_discussion_update_last_post($discussionid) { $discussionobject->id = $discussionid; $discussionobject->usermodified = $lastpost->userid; $discussionobject->timemodified = $lastpost->modified; - if ($DB->update_record('forum_discussions', $discussionobject)) { - return $lastpost->id; - } + $DB->update_record('forum_discussions', $discussionobject); + return $lastpost->id; } // To get here either we couldn't find a post for the discussion (weird) diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php index e6763442c9a..b4c6257ae5d 100644 --- a/mod/glossary/db/upgrade.php +++ b/mod/glossary/db/upgrade.php @@ -82,9 +82,8 @@ function xmldb_glossary_upgrade($oldversion) { $file_record = array('contextid'=>$context->id, 'component'=>'mod_glossary', 'filearea'=>$filearea, 'itemid'=>$entry->id, 'filepath'=>'/', 'filename'=>$filename, 'userid'=>$entry->userid); if ($fs->create_file_from_pathname($file_record, $filepath)) { $entry->attachment = '1'; - if ($DB->update_record('glossary_entries', $entry)) { - unlink($filepath); - } + $DB->update_record('glossary_entries', $entry); + unlink($filepath); } } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index c94f6cc3213..e79d636b8cb 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -116,13 +116,13 @@ function glossary_update_instance($glossary) { print_error('unknowformat', '', '', $glossary->displayformat); } - $return = $DB->update_record("glossary", $glossary); + $DB->update_record("glossary", $glossary); if ($glossary->defaultapproval) { $DB->execute("UPDATE {glossary_entries} SET approved = 1 where approved <> 1 and glossaryid = ?", array($glossary->id)); } glossary_grade_item_update($glossary); - return $return; + return true; } /** diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php index 1709d4d330a..4c1851cda0f 100644 --- a/mod/quiz/restorelib.php +++ b/mod/quiz/restorelib.php @@ -560,7 +560,7 @@ if ($result != $content) { //Update record $quiz->intro = $result; - $status = $DB->update_record("quiz",$quiz); + $DB->update_record("quiz",$quiz); if (debugging()) { if (!defined('RESTORE_SILENTLY')) { echo '
'.s($content).'
changed to
'.s($result).'

'; @@ -606,7 +606,7 @@ $wtm = new WikiToMarkdown(); $record->questiontext = $wtm->convert($record->questiontext, $restore->course_id); $record->questiontextformat = FORMAT_MARKDOWN; - $status = $DB->update_record('question', $record); + $DB->update_record('question', $record); //Do some output $i++; if (($i+1) % 1 == 0) { diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php index 7203b889f33..21e66bd803e 100644 --- a/mod/quiz/restorelibpre15.php +++ b/mod/quiz/restorelibpre15.php @@ -1757,7 +1757,7 @@ $wtm = new WikiToMarkdown(); $record->questiontext = $wtm->convert($record->questiontext, $restore->course_id); $record->questiontextformat = FORMAT_MARKDOWN; - $status = $DB->update_record('question', $record); + $DB->update_record('question', $record); //Do some output $i++; if (($i+1) % 1 == 0) { diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php index 1d7b692ca54..921900ef738 100755 --- a/mod/scorm/aicc.php +++ b/mod/scorm/aicc.php @@ -351,7 +351,7 @@ $value = scorm_add_time($track->value, $SESSION->scorm_session_time); $track->value = $value; $track->timemodified = time(); - $id = $DB->update_record('scorm_scoes_track',$track); + $DB->update_record('scorm_scoes_track',$track); } else { $track = new object(); $track->userid = $USER->id; diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 59b2c169dcb..b51dc6b8f73 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -266,9 +266,8 @@ function scorm_parse_aicc($scorm) { $id = null; if ($oldscoid = scorm_array_search('identifier',$sco->identifier,$oldscoes)) { $sco->id = $oldscoid; - if ($DB->update_record('scorm_scoes',$sco)) { - $id = $oldscoid; - } + $DB->update_record('scorm_scoes',$sco); + $id = $oldscoid; $DB->delete_records('scorm_scoes_data', array('scoid'=>$oldscoid)); unset($oldscoes[$oldscoid]); } else { diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index 63c3707ebd3..8c794478f29 100755 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -376,7 +376,7 @@ function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value,$fo if ($tracktest = $DB->get_record_select('scorm_scoes_track','userid=? AND scormid=? AND scoid=? AND attempt=? AND element=\'cmi.core.lesson_status\'', array($userid, $scormid, $scoid, $attempt))) { if ($tracktest->value == "incomplete") { $tracktest->value = "completed"; - $idtest = $DB->update_record('scorm_scoes_track',$tracktest); + $DB->update_record('scorm_scoes_track',$tracktest); } } } @@ -386,7 +386,8 @@ function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value,$fo if ($element != 'x.start.time' ) { //don't update x.start.time - keep the original value. $track->value = addslashes_js($value); $track->timemodified = time(); - $id = $DB->update_record('scorm_scoes_track',$track); + $DB->update_record('scorm_scoes_track',$track); + $id = $track->id; } } else { $track->userid = $userid; diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php index 08bade7cdf9..1f5410c624c 100644 --- a/mod/workshop/db/upgrade.php +++ b/mod/workshop/db/upgrade.php @@ -172,9 +172,8 @@ function xmldb_workshop_upgrade($oldversion) { 'userid' => $submission->authorid); if ($fs->create_file_from_pathname($filerecord, $filepath)) { $submission->attachment = 1; - if ($DB->update_record('workshop_submissions', $submission)) { - unlink($filepath); - } + $DB->update_record('workshop_submissions', $submission); + unlink($filepath); } } } diff --git a/question/restorelib.php b/question/restorelib.php index cc37a2aff3c..79fb182fcff 100644 --- a/question/restorelib.php +++ b/question/restorelib.php @@ -253,7 +253,7 @@ } else { $updateobj->parent = 0; } - $status = $status && $DB->update_record('question_categories', $updateobj); + $DB->update_record('question_categories', $updateobj); } } //now we have recoded all parents, check through all parents and set parent to be @@ -291,7 +291,7 @@ $updateobj = new object(); $updateobj->id = $id; $updateobj->parent = $parent; - $status = $status && $DB->update_record('question_categories', $updateobj); + $DB->update_record('question_categories', $updateobj); } } return $status; diff --git a/question/type/shortanswer/questiontype.php b/question/type/shortanswer/questiontype.php index d285f45e93e..e82ef774a0b 100644 --- a/question/type/shortanswer/questiontype.php +++ b/question/type/shortanswer/questiontype.php @@ -319,7 +319,7 @@ class question_shortanswer_qtype extends default_questiontype { // We have the answers field recoded to its new ids $questionextradata->answers = $answers_field; // Update the question - $status = $status && $DB->update_record($questionextensiontable, $questionextradata); + $DB->update_record($questionextensiontable, $questionextradata); } } diff --git a/user/profile/definelib.php b/user/profile/definelib.php index 494ffb20034..05ab644aaef 100644 --- a/user/profile/definelib.php +++ b/user/profile/definelib.php @@ -368,9 +368,8 @@ function profile_move_category($id, $move) { $category->sortorder = $neworder; /// Update the category records - if ($DB->update_record('user_info_category', $category) and $DB->update_record('user_info_category', $swapcategory)) { - return true; - } + $DB->update_record('user_info_category', $category) and $DB->update_record('user_info_category', $swapcategory); + return true; } return false;