diff --git a/core/modules/book/lib/Drupal/book/Tests/BookTest.php b/core/modules/book/lib/Drupal/book/Tests/BookTest.php index eba9ff9..523e73f 100644 --- a/core/modules/book/lib/Drupal/book/Tests/BookTest.php +++ b/core/modules/book/lib/Drupal/book/Tests/BookTest.php @@ -383,7 +383,7 @@ function testBookDelete() { foreach ($nodes as $node) { $nids[] = $node->nid; } - node_delete_multiple($nids); + entity_delete_multiple('node', $nids); $this->drupalPost('node/' . $this->book->nid . '/outline/remove', $edit, t('Remove')); $node = node_load($this->book->nid, TRUE); $this->assertTrue(empty($node->book), 'Deleting childless top-level book node properly allowed.'); diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index 139b2d2..16ac41b 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -688,7 +688,7 @@ function node_multiple_delete_confirm($form, &$form_state, $nodes) { */ function node_multiple_delete_confirm_submit($form, &$form_state) { if ($form_state['values']['confirm']) { - node_delete_multiple(array_keys($form_state['values']['nodes'])); + entity_delete_multiple('node', array_keys($form_state['values']['nodes'])); $count = count($form_state['values']['nodes']); watchdog('content', 'Deleted @count posts.', array('@count' => $count)); drupal_set_message(format_plural($count, 'Deleted 1 post.', 'Deleted @count posts.')); diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index 78a3139..62cec78 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -89,7 +89,7 @@ * - hook_entity_view() (all) * - hook_node_view_alter() (all) * - hook_entity_view_alter() (all) - * - Deleting a node (calling node_delete() or node_delete_multiple()): + * - Deleting a node (calling node_delete() or entity_delete_multiple()): * - Node is loaded (see Loading section above) * - hook_delete() (node-type-specific) * - hook_node_predelete() (all) @@ -462,7 +462,7 @@ function hook_node_operations() { /** * Act before node deletion. * - * This hook is invoked from node_delete_multiple() after the type-specific + * This hook is invoked from entity_delete_multiple() after the type-specific * hook_delete() has been invoked, but before hook_entity_predelete() and * field_attach_delete() are called, and before the node is removed from the * node table in the database. @@ -471,7 +471,7 @@ function hook_node_operations() { * The node that is about to be deleted. * * @see hook_node_predelete() - * @see node_delete_multiple() + * @see entity_delete_multiple() * @ingroup node_api_hooks */ function hook_node_predelete(\Drupal\Core\Entity\EntityInterface $node) { @@ -483,14 +483,14 @@ function hook_node_predelete(\Drupal\Core\Entity\EntityInterface $node) { /** * Respond to node deletion. * - * This hook is invoked from node_delete_multiple() after field_attach_delete() + * This hook is invoked from entity_delete_multiple() after field_attach_delete() * has been called and after the node has been removed from the database. * * @param \Drupal\Core\Entity\EntityInterface $node * The node that has been deleted. * * @see hook_node_predelete() - * @see node_delete_multiple() + * @see entity_delete_multiple() * @ingroup node_api_hooks */ function hook_node_delete(\Drupal\Core\Entity\EntityInterface $node) { @@ -1092,7 +1092,7 @@ function hook_node_type_delete($info) { * This hook is invoked only on the module that defines the node's content type * (use hook_node_delete() to respond to all node deletions). * - * This hook is invoked from node_delete_multiple() after the node has been + * This hook is invoked from entity_delete_multiple() after the node has been * removed from the node table in the database, before hook_node_delete() is * invoked, and before field_attach_delete() is called. * diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 5c934df..09c6e8c 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1001,21 +1001,9 @@ function node_save(EntityInterface $node) { * A node ID. */ function node_delete($nid) { - node_delete_multiple(array($nid)); + entity_delete_multiple('node', array($nid)); } -/** - * Deletes multiple nodes. - * - * @param $nids - * An array of node IDs. - * - * @see hook_node_predelete() - * @see hook_node_delete() - */ -function node_delete_multiple($nids) { - entity_delete_multiple('node', $nids); -} /** * Deletes a node revision. @@ -1470,7 +1458,7 @@ function node_user_predelete($account) { ->condition('uid', $account->uid) ->execute() ->fetchCol(); - node_delete_multiple($nodes); + entity_delete_multiple('node', $nodes); // Delete old revisions. $revisions = db_query('SELECT vid FROM {node_revision} WHERE uid = :uid', array(':uid' => $account->uid))->fetchCol(); foreach ($revisions as $revision) {