1 files changed, 5 insertions, 4 deletions

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 4ebb7815..4f49affa 100644
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -418,7 +418,8 @@ window.onload = function () {
      *
      * TODO: support error code in the backend for AJAX requests
      */
-    var existingTags = document.querySelector('input[name="taglist"]').value.split(' ');
+    var tagList = document.querySelector('input[name="taglist"]');
+    var existingTags = tagList ? tagList.value.split(' ') : [];
     var awesomepletes = [];
 
     // Display/Hide rename form
@@ -515,7 +516,7 @@ window.onload = function () {
         });
     });
 
-    updateAwesompleteList('.rename-tag-input', document.querySelector('input[name="taglist"]').value.split(' '), awesomepletes);
+    updateAwesompleteList('.rename-tag-input', existingTags, awesomepletes);
 };
 
 /**
@@ -605,7 +606,7 @@ function htmlEntities(str)
 
 function activateFirefoxSocial(node) {
     var loc = location.href;
-    var baseURL = loc.substring(0, loc.lastIndexOf("/"));
+    var baseURL = loc.substring(0, loc.lastIndexOf("/") + 1);
 
     // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable.
     var data = {
@@ -618,7 +619,7 @@ function activateFirefoxSocial(node) {
         icon32URL: baseURL + "/images/favicon.ico",
         icon64URL: baseURL + "/images/favicon.ico",
 
-        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
+        shareURL: baseURL + "?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi",
         homepageURL: baseURL
     };
     node.setAttribute("data-service", JSON.stringify(data));