aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-01-23 14:47:35 +0000
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-01-23 14:47:35 +0000
commit47f8a6dd9ebb1d7e7595215186db18522f4ea0de (patch)
tree8301d7c053fc9579364c2cd8faddf9de2123af11
parentd419572c289ee06a690de4af6644a9de9f02b6e2 (diff)
downloadsemanticscuttle-47f8a6dd9ebb1d7e7595215186db18522f4ea0de.tar.gz
semanticscuttle-47f8a6dd9ebb1d7e7595215186db18522f4ea0de.tar.bz2
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
-rw-r--r--bookmarks.php3
-rw-r--r--index.php1
-rw-r--r--templates/sidebar.block.linked.php8
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) {