From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 20 Sep 2018 21:34:44 +0000 (+0200)
Subject: Merge pull request #1215 from ArthurHoaro/hotfix/tag-deletion
X-Git-Tag: v0.10.3~2^2~18
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=a4fbe88b6d007094fa395b17802e593ecca0588b;hp=bede8e1b633d720d6a7d1b05ba367811f3ac2b87

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 8bf79d3e..1b8d8c36 100644
--- 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 8f6ee50a..eb717536 100644
--- 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);