diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-09-12 18:13:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-09-12 18:13:22 +0000 |
| commit | ee35d9136e70cbafad2574089c6f346ab5a635ba (patch) | |
| tree | 6fb851c3c2834da31c46ff53d1e9ba711e54198c | |
| parent | 9113a1ae280dd2387554be1bb3448b4e8da4b0e2 (diff) | |
| download | brdo-ee35d9136e70cbafad2574089c6f346ab5a635ba.tar.gz brdo-ee35d9136e70cbafad2574089c6f346ab5a635ba.tar.bz2 | |
- 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.
| -rw-r--r-- | modules/forum.module | 4 | ||||
| -rw-r--r-- | modules/forum/forum.module | 4 | ||||
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 2 |
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, " » ") ."</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, " » ") ."</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, " » ") ."</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, " » ") ."</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), |