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

diff --git a/bookmarks.php b/bookmarks.php
index 591f0cbb91622df09e1e77b482780fe447deed06..8b1644ef55b6b7b680e3823f4f34dafb348362ed 100644 (file)
--- 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 17e7e0a093abc41ef70de9d27817e93437e3b473..74572545dc3047221e45b8715ec23d930d7ef793 100644 (file)
--- 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 7bbde810db26de602ccbad306d1da01e1e88d03a..24ca7e6e766e21e6af7846372037935a1a8762cf 100644 (file)
--- 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) {