interface bug fix: alltags page doesn't display the complete tree for a user

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@23 b3834d28-1941-0410-a4f8-b48e95affb8f

3 files changed, 8 insertions, 4 deletions

diff --git a/bookmarks.php b/bookmarks.php
index 591f0cb..8b1644e 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -221,6 +221,9 @@ if ($templatename == 'editbookmark.tpl') {
     $tplVars['pagetitle'] = $title;
     $tplVars['subtitle'] = $title;
 }
+
+$tplVars['summarizeLinkedTags'] = true;
+
 $templateservice->loadTemplate($templatename, $tplVars);
 
 if ($usecache && $endcache) {
diff --git a/index.php b/index.php
index 17e7e0a..7457254 100644
--- a/index.php
+++ b/index.php
@@ -77,6 +77,7 @@ $tplVars['total'] = $bookmarks['total'];
 $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
 $tplVars['cat_url'] = createURL('tags', '%2$s');
 $tplVars['nav_url'] = createURL('index', '%3$s');
+$tplVars['summarizeLinkedTags'] = true;
 
 $templateservice->loadTemplate('bookmarks.tpl', $tplVars);
 
diff --git a/templates/sidebar.block.linked.php b/templates/sidebar.block.linked.php
index 7bbde81..24ca7e6 100644
--- a/templates/sidebar.block.linked.php
+++ b/templates/sidebar.block.linked.php
@@ -25,7 +25,7 @@ function displayLinkedTags($tag, $linkType, $uId, $cat_url, $user, $editingMode
     $output.= '</tr>';
 
     if(!in_array($tag, $stopList)) {
-	$linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $userid);
+	$linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId);
 	$precedentTag = $tag;
 	$stopList[] = $tag;
 	$level = $level + 1;
@@ -45,10 +45,10 @@ $explodedTags = array();
 if ($currenttag) {
     $explodedTags = explode('+', $currenttag);
 } else {
-    if($userid != null) {
-        $orphewTags = $tag2tagservice->getOrphewTags('>', $userid);
-    } else {
+    if($summarizeLinkedTags == true) {
 	$orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb");
+    } else {
+        $orphewTags = $tag2tagservice->getOrphewTags('>', $userid);
     }
 
     foreach($orphewTags as $orphewTag) {