summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-11-23 23:11:59 +0000
committerDries Buytaert <dries@buytaert.net>2004-11-23 23:11:59 +0000
commit30110a87701149dd23f250354266159ea3e07c35 (patch)
tree775143b1e81d7ca56df00f29a576e90218545f56 /themes
parent9574766ad8f8810baf42a81ae105984254f0fc0a (diff)
downloadbrdo-30110a87701149dd23f250354266159ea3e07c35.tar.gz
brdo-30110a87701149dd23f250354266159ea3e07c35.tar.bz2
- Patch #6166 by Moshe: node preview should not display links. Push the links to the theme instead of the theme having to pull them in using node_link().
TODO: 1. Update theme upgrade instructions in the handbook: node_link() is gone. 2. Remove page_link() just like we removed node_link().
Diffstat (limited to 'themes')
-rw-r--r--themes/chameleon/chameleon.theme4
-rw-r--r--themes/engines/xtemplate/xtemplate.engine4
2 files changed, 4 insertions, 4 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index d81ed752e..b6c979311 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -136,8 +136,8 @@ function chameleon_node($node, $main = 0, $page = 0) {
$terms = taxonomy_link("taxonomy terms", $node);
}
- if ($links = link_node($node, $main)) {
- $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $terms, $links)) ."</div>\n";
+ if ($node->links) {
+ $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $terms, $node->links)) ."</div>\n";
}
$output .= "</div>\n";
diff --git a/themes/engines/xtemplate/xtemplate.engine b/themes/engines/xtemplate/xtemplate.engine
index 691b1e8d0..253e3e85a 100644
--- a/themes/engines/xtemplate/xtemplate.engine
+++ b/themes/engines/xtemplate/xtemplate.engine
@@ -63,8 +63,8 @@ function xtemplate_node($node, $main = 0, $page = 0) {
$xtemplate->template->parse("node.taxonomy");
}
- if ($links = link_node($node, $main)) {
- $xtemplate->template->assign("links", theme_links($links));
+ if ($node->links) {
+ $xtemplate->template->assign("links", theme_links($node->links));
$xtemplate->template->parse("node.links");
}