Index: content_lock.module
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- content_lock.module	(date 1458813139000)
+++ content_lock.module	(revision )
@@ -457,7 +457,7 @@
     $nid = $form['#node_revision']->nid;
     // Don't ask the user if he wants to leave the page when
     // cancelling a reversion.
-    $internal_urls[] = $form['actions']['cancel']['#href'];
+    $internal_urls[] = $form['actions']['content_lock_cancel']['#href'];
     $internal_form_selectors[] = '.confirmation';
   }
 
@@ -535,12 +535,12 @@
     if ($form_id == 'node_revision_revert_confirm') {
       /* Hijack the default cancel link to become a lock-releasing link */
       $destination = 'node/' . $nid . '/revisions';
-      if (!empty($form['actions']['cancel']['#href'])) {
-        $destination = $form['actions']['cancel']['#href'];
+      if (!empty($form['actions']['content_lock_cancel']['#href'])) {
+        $destination = $form['actions']['content_lock_cancel']['#href'];
       }
-      $form['actions']['cancel']['#href'] = 'admin/content/' . $nid . '/content_lock/releaseown';
-      $form['actions']['cancel'] += array('#options' => array());
-      $form['actions']['cancel']['#options'] += array(
+      $form['actions']['content_lock_cancel']['#href'] = 'admin/content/' . $nid . '/content_lock/releaseown';
+      $form['actions']['content_lock_cancel'] += array('#options' => array());
+      $form['actions']['content_lock_cancel']['#options'] += array(
         'query' => array(
           'token' => content_lock_get_release_token($nid),
           'destination' => $destination,
@@ -550,7 +550,7 @@
     // If we're editing a node (not adding).
     else {
       if ($node->nid) {
-        $form['actions']['cancel'] = array(
+        $form['actions']['content_lock_cancel'] = array(
           '#type' => 'button',
           '#weight' => 2000,
           '#value' => t('Cancel'),