diff --git a/core/modules/node/node.preview.js b/core/modules/node/node.preview.js index a8e61bc..9041f24 100644 --- a/core/modules/node/node.preview.js +++ b/core/modules/node/node.preview.js @@ -10,7 +10,7 @@ attach: function (context) { var $preview = $(context).find('.page-node-preview').once('node-preview'); if ($preview.length) { - $preview.on('click.preview', 'a:not([href^=#], #edit-backlink)', function (e) { + $preview.on('click.preview', 'a:not([href^=#], #edit-backlink, #toolbar-administration a)', function (e) { e.preventDefault(); }); } diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php index eca717e..f5ce77c 100644 --- a/core/modules/node/src/NodeForm.php +++ b/core/modules/node/src/NodeForm.php @@ -93,9 +93,9 @@ public function form(array $form, FormStateInterface $form_state) { if ($preview = $store->get($uuid)) { $form_state = $preview; - // Remove the redirect property that was set in NodeForm::preview(). - if (isset($form_state['redirect'])) { - unset($form_state['redirect']); + // Remove the redirect value that was set in NodeForm::preview(). + if ($form_state->hasValue('redirect')) { + $form_state->unsetValue('redirect'); } // Rebuild the form.