Commit ee35d913 authored by Dries's avatar Dries

- Made the forum module's breadcrumb navigation fully themable.  Patch by Nick.

- Changed 'pubdate' to 'pubDate'.  Patch by Kristjan.

- Fixed in Xtemplate theme; don't use return value of node_url() raw and uncut.
  Patch by me.
parent 9113a1ae
......@@ -157,7 +157,7 @@ function forum_view($node, $main = 0) {
$trail[] = l(t("Forums"), "forum");
$trail[] = l($term_data->name, "forum/$term_data->tid");
print "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
theme("path", $trail);
}
$node->teaser = check_output($node->teaser);
......@@ -490,7 +490,7 @@ function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_p
$output .= "</div>";
theme("header");
print "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
theme("path", $trail);
theme("box", $title, $output);
theme("footer");
}
......
......@@ -157,7 +157,7 @@ function forum_view($node, $main = 0) {
$trail[] = l(t("Forums"), "forum");
$trail[] = l($term_data->name, "forum/$term_data->tid");
print "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
theme("path", $trail);
}
$node->teaser = check_output($node->teaser);
......@@ -490,7 +490,7 @@ function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_p
$output .= "</div>";
theme("header");
print "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
theme("path", $trail);
theme("box", $title, $output);
theme("footer");
}
......
......@@ -1013,7 +1013,7 @@ function node_feed($nodes = 0, $channel = array()) {
foreach ($languages as $key => $value) break;
if (!$channel["language"]) $channel["language"] = $key ? $key : "en";
$output .= "<rss version=\"". $channel["version"] . "\">\n";
$output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"], array("pubdate" => date("r", $pubdate)));
$output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"], array("pubDate" => date("r", $pubdate)));
$output .= "</rss>\n";
header("Content-Type: text/xml");
......
......@@ -1013,7 +1013,7 @@ function node_feed($nodes = 0, $channel = array()) {
foreach ($languages as $key => $value) break;
if (!$channel["language"]) $channel["language"] = $key ? $key : "en";
$output .= "<rss version=\"". $channel["version"] . "\">\n";
$output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"], array("pubdate" => date("r", $pubdate)));
$output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"], array("pubDate" => date("r", $pubdate)));
$output .= "</rss>\n";
header("Content-Type: text/xml");
......
......@@ -35,7 +35,7 @@ function Theme_xtemplate() {
function node($node, $main = 0) {
$this->template->assign(array(
"link" => node_url($node),
"link" => url(node_url($node)),
"title" => ucfirst($node->title),
"author" => format_name($node),
"date" => format_date($node->created),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment