From d8ee343473c23d856f1b148067060e9edd0aa9b0 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 20 Jan 2012 15:09:39 +0100
Subject: [PATCH] Fix bug #3384416: Use URL with protocol in bookmarklet

---
 data/templates/default/bookmarklet.inc.php | 8 ++++----
 doc/ChangeLog                              | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php
index 9867745..c93f581 100644
--- a/data/templates/default/bookmarklet.inc.php
+++ b/data/templates/default/bookmarklet.inc.php
@@ -45,7 +45,7 @@ if (browser == "Opera") {
         + '<?php
 $popupLink = 'javascript:'
     . "location.href='"
-        . createURL('bookmarks', $GLOBALS['user'])
+        . addProtocolToUrl(createURL('bookmarks', $GLOBALS['user']))
         . '?action=add'
         . "&address='+encodeURIComponent(document.location.href)+'"
         . "&title='+encodeURIComponent(document.title)+'"
@@ -71,7 +71,7 @@ echo jsEscTitle(htmlspecialchars($link));
         + '<?php
 $popupLink = 'javascript:'
     . 'open('
-        . "'" . createURL('bookmarks', $GLOBALS['user'])
+        . "'" . addProtocolToUrl(createURL('bookmarks', $GLOBALS['user']))
         . '?action=add'
         . '&popup=1'
         . "&address='+encodeURIComponent(document.location.href)+'"
@@ -97,7 +97,7 @@ echo jsEscTitle(htmlspecialchars($link));
 } else {
     $('#bookmarklet').append(
         '<ul>'
-        + '<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>'
+        + '<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])); ?>?action=add&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>'
         + '<li>'
         + '<a class="bookmarklet" href="'
         + 'javascript:x=document;'
@@ -105,7 +105,7 @@ echo jsEscTitle(htmlspecialchars($link));
         + 't=encodeURIComponent(x.title);'
         + 'd=encodeURIComponent('+selection+');'
         + 'open('
-        + '\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;popup=1&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d,\'<?php echo htmlspecialchars(jsEscTitleDouble($GLOBALS['sitename'])); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2'
+        + '\'<?php echo addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])); ?>?action=add&amp;popup=1&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d,\'<?php echo htmlspecialchars(jsEscTitleDouble($GLOBALS['sitename'])); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2'
         + ');void 0;">'
         + '<?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?>'
         + '</a>'
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d52787c..13fc747 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -14,6 +14,7 @@ ChangeLog for SemantiScuttle
 - Fix bug #3431742: open_basedir problems with /etc/ config files
 - Fix bug #3436624: Wrong URL for Delicious API when importing
 - Fix bug #3463481: RSS feed show warnings in feedvalidator.org
+- Fix bug #3384416: Use URL with protocol in bookmarklet
 - Implement request #3403609: fr_CA translation update
 - Implement patch #3476011: PostgreSQL tables can not be initialized
   (Frédéric Fauberteau [triaxx])