Merge branch '0.98'

3 files changed, 5 insertions, 5 deletions

diff --git a/data/templates/default/sidebar.block.linked.php b/data/templates/default/sidebar.block.linked.php
index 9aa3cc0..d3a25a5 100644
--- a/data/templates/default/sidebar.block.linked.php
+++ b/data/templates/default/sidebar.block.linked.php
@@ -14,7 +14,7 @@ require_once('sidebar.linkedtags.inc.php');
 /* Manage input */
 $user = isset($user)?$user:'';
 $userid = isset($userid)?$userid:0;
-$currenttag = isset($currenttag)?$currenttag:'';
+$currenttag = isset($currenttag) ? str_replace('+', ',', $currenttag) : '';
 //$summarizeLinkedTags = isset($summarizeLinkedTags)?$summarizeLinkedTags:false;
 
 $logged_on_userid = $userservice->getCurrentUserId();
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ab3681b..714eae3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle
 - Fix bug #3385724: Rename tag ends with XML Parsing Error
 - Fix bug #3386178: "system:unfiled" secret tag does not work
 - Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
+- Fix bug #3382126: Linked tags does not work for tags with spaces
 - Fix delicious API help page link
 
 Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php
index d8ddb5b..9bb3b1f 100644
--- a/www/ajax/getlinkedtags.php
+++ b/www/ajax/getlinkedtags.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * Returns a list of tags linked to the given one,
+ * Returns a list of tags linked to the given one(s),
  * suitable for jsTree consumption.
  *
  * Accepted GET parameters:
  *
  * @param string  $tag    Tag for which the children tags shall be returned
- *                        Multiple tags (separated with space or "+") are
- *                        supported.
+ *                        Multiple tags (separated with comma) are supported.
  *                        If no tag is given, all top-level tags are loaded.
  * @param integer $uId    User ID to fetch the tags for
  * @param boolean $parent Load parent tags
@@ -32,7 +31,7 @@ $tag            = isset($_GET['tag']) ? $_GET['tag'] : null;
 $uId            = isset($_GET['uId']) ? (int)$_GET['uId'] : 0;
 $loadParentTags = isset($_GET['parent']) ? (bool)$_GET['parent'] : false;
 
-$tags = explode(' ', trim($tag));
+$tags = explode(',', trim($tag));
 if (count($tags) == 1 && $tags[0] == '') {
     //no tags
     $tags = array();