From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 4 Aug 2006 02:41:08 +0000 (+0000)
Subject: use htmlpage a couple of places instead of hardcoding the extension
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a1c7308b7d26915956d938808bbb05c194d60a45?ds=sidebyside

use htmlpage a couple of places instead of hardcoding the extension
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 7c4ab3d10..41c25fe26 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -296,7 +296,7 @@ sub add_page (@) { #{{{
 	if (ref $feed->{tags}) {
 		$template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
 	}
-	IkiWiki::writefile($guid->{page}.".html", $IkiWiki::config{srcdir},
+	IkiWiki::writefile(IkiWiki::htmlpage($guid->{page}), $IkiWiki::config{srcdir},
 		$template->output);
 
 	# Set the mtime, this lets the build process get the right creation
@@ -371,7 +371,7 @@ sub remove_feeds () { #{{{
 sub pagefile ($) { #{{{
 	my $page=shift;
 
-	return "$IkiWiki::config{srcdir}/$page.html";
+	return "$IkiWiki::config{srcdir}/".IkiWiki::htmlpage($page);
 } #}}}
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7cb55f128..09b871900 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -74,7 +74,7 @@ sub parentlinks ($) { #{{{
 	foreach my $dir (reverse split("/", $page)) {
 		if (! $skip) {
 			$path.="../";
-			unshift @ret, { url => "$path$dir.html", page => pagetitle($dir) };
+			unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
 		}
 		else {
 			$skip=0;