summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/forum.module4
-rw-r--r--modules/forum/forum.module4
-rw-r--r--modules/node.module2
-rw-r--r--modules/node/node.module2
-rw-r--r--themes/xtemplate/xtemplate.theme2
5 files changed, 7 insertions, 7 deletions
diff --git a/modules/forum.module b/modules/forum.module
index 57e789a96..3ac6dc2ca 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -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");
}
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 57e789a96..3ac6dc2ca 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -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");
}
diff --git a/modules/node.module b/modules/node.module
index 77667b614..35a90e347 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -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");
diff --git a/modules/node/node.module b/modules/node/node.module
index 77667b614..35a90e347 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -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");
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme
index f5d477537..0e55852b4 100644
--- a/themes/xtemplate/xtemplate.theme
+++ b/themes/xtemplate/xtemplate.theme
@@ -35,7 +35,7 @@ class Theme_xtemplate extends BaseTheme {
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),