From 6934f30b8e3e415ee83c832de7a9c0f911009c7b Mon Sep 17 00:00:00 2001
From: erica <erica@344430.no-reply.drupal.org>
Date: Wed, 6 Apr 2022 10:37:59 -0400
Subject: [PATCH] Issue #3249493 by Eric_A, seanB, gaards, adriancid, DuneBL,
3CWebDev, Michelle-Buckby, jmoruzi: Not able to delete a revision via the
interface - Object of class Drupal\node\Entity\Node could not be converted to
string
---
node_revision_delete.module | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/node_revision_delete.module b/node_revision_delete.module
index 7b216e6..3164002 100644
--- a/node_revision_delete.module
+++ b/node_revision_delete.module
@@ -187,12 +187,10 @@ function node_revision_delete_form_node_type_form_builder($entity_type, NodeType
* Implements hook_form_BASE_FORM_ID_alter().
*/
function node_revision_delete_form_node_revision_delete_confirm_alter(&$form, FormStateInterface &$form_state, $form_id) {
- // @TODO: Update the code once this issue was in core:
- // https://www.drupal.org/project/drupal/issues/2730631 .
// Get the node id from URL.
- $nid = \Drupal::routeMatch()->getParameter('node');
+ $nid = \Drupal::routeMatch()->getRawParameter('node');
// Get the revision id from URL.
- $revision_id = \Drupal::routeMatch()->getParameter('node_revision');
+ $revision_id = \Drupal::routeMatch()->getRawParameter('node_revision');
// Get list of revisions older than current revision.
$revisions_before = \Drupal::service('node_revision_delete')->getPreviousRevisions($nid, $revision_id);
@@ -279,9 +277,9 @@ function node_revision_delete_form_node_revision_delete_confirm_alter(&$form, Fo
function _node_revision_bulk_delete_submit(array &$form, FormStateInterface $form_state) {
if ($form_state->getValue('delete_prior_revisions') == 1) {
// Get the node id from URL.
- $nid = \Drupal::routeMatch()->getParameter('node');
+ $nid = \Drupal::routeMatch()->getRawParameter('node');
// Get the revision id from URL.
- $revision_id = \Drupal::routeMatch()->getParameter('node_revision');
+ $revision_id = \Drupal::routeMatch()->getRawParameter('node_revision');
// Get list of revisions older than current revision.
$revisions_before = \Drupal::service('node_revision_delete')->getPreviousRevisions($nid, $revision_id);
--
GitLab