Merge pull request #1215 from ArthurHoaro/hotfix/tag-deletion

Fix a JS bug preventing AJAX tag deletion to work

diff --git a/assets/default/js/base.js b/assets/default/js/base.js
index 8bf79d3e4c612efac7e815ca421b3c2acff14023..1b8d8c36fa33d603a78232495e6e612d92eb6879 100644 (file)
--- a/assets/default/js/base.js
+++ b/assets/default/js/base.js
@@ -548,7 +548,7 @@ function init(description) {
       event.preventDefault();
       const block = findParent(event.target, 'div', { class: 'tag-list-item' });
       const tag = block.getAttribute('data-tag');
-      const refreshedToken = document.getElementById('token');
+      const refreshedToken = document.getElementById('token').value;
 
       if (confirm(`Are you sure you want to delete the tag "${tag}"?`)) {
         const xhr = new XMLHttpRequest();

diff --git a/index.php b/index.php
index 8f6ee50affaf45f69c0d169f4b4f36901af5f1ba..eb717536c58f33d8b8a63b7933765c075d364b35 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1084,7 +1084,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
             die(t('Wrong token.'));
         }
 
-        $alteredLinks = $LINKSDB->renameTag(escape($_POST['fromtag']), escape($_POST['totag']));
+        $toTag = isset($_POST['totag']) ? escape($_POST['totag']) : null;
+        $alteredLinks = $LINKSDB->renameTag(escape($_POST['fromtag']), $toTag);
         $LINKSDB->save($conf->get('resource.page_cache'));
         foreach ($alteredLinks as $link) {
             $history->updateLink($link);