diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-10 15:03:53 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-10 15:03:53 +0000 |
| commit | c5aa55b38ef944eae0b36f4354fa2e8c33fb59c9 (patch) | |
| tree | cf12579b63f8da7d98548e2f3d60b13ee01f1336 /modules/comment | |
| parent | 58ad1fb2f487917be7cb725ca39f5ad6aeb68efe (diff) | |
| download | brdo-c5aa55b38ef944eae0b36f4354fa2e8c33fb59c9.tar.gz brdo-c5aa55b38ef944eae0b36f4354fa2e8c33fb59c9.tar.bz2 | |
#204705 by pwolanin: abort user_save on SQL errors, to avoid data corruption
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/comment.module | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 2cc44455c..222164351 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1652,7 +1652,13 @@ function comment_controls_submit($form, &$form_state) { $comments_per_page = $form_state['values']['comments_per_page']; if ($user->uid) { - $user = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page)); + $account = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page)); + // Terminate if an error occured during user_save(). + if (!$account) { + drupal_set_message(t("Error saving user account."), 'error'); + return; + } + $user = $account; } else { $_SESSION['comment_mode'] = $mode; |