diff options
Diffstat (limited to 'modules/node/node.pages.inc')
| -rw-r--r-- | modules/node/node.pages.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index 242fcf658..35d9656a2 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -602,12 +602,15 @@ function node_revision_delete_confirm($form_state, $node_revision) { function node_revision_delete_confirm_submit($form, &$form_state) { $node_revision = $form['#node_revision']; - db_query("DELETE FROM {node_revision} WHERE nid = %d AND vid = %d", $node_revision->nid, $node_revision->vid); + db_delete('node_revision') + ->condition('nid', $node_revision->nid) + ->condition('vid', $node_revision->vid) + ->execute(); node_invoke_node($node_revision, 'delete_revision'); watchdog('content', '@type: deleted %title revision %revision.', array('@type' => $node_revision->type, '%title' => $node_revision->title, '%revision' => $node_revision->vid)); drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', array('%revision-date' => format_date($node_revision->revision_timestamp), '@type' => node_get_types('name', $node_revision), '%title' => $node_revision->title))); $form_state['redirect'] = 'node/' . $node_revision->nid; - if (db_result(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = %d', $node_revision->nid)) > 1) { + if (db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid', array(':nid' => $node_revision->nid))->fetchField() > 1) { $form_state['redirect'] .= '/revisions'; } } |