X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/13c7a51f1f4b2f809681c4e2651bf0d3992a863e..9b145798c75e88267f4782b3cedc9d5deb41a0c8:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d0cfbf873..452fdd267 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -137,6 +137,14 @@ sub preprocess_inline (@) { #{{{
 			exists $params{rootpage} ? $params{rootpage} : $params{page});
 		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
 		$formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
+		if (exists $params{postformtext}) {
+			$formtemplate->param(postformtext =>
+				$params{postformtext});
+		}
+		else {
+			$formtemplate->param(postformtext =>
+				gettext("Add a new post titled:"));
+		}
 		$ret.=$formtemplate->output;
 	}
 	elsif ($feeds) {
@@ -312,14 +320,13 @@ sub genfeed ($$$$@) { #{{{
 	my $page=shift;
 	my @pages=@_;
 	
-	my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
+	my $url=URI->new(encode_utf8($config{url}."/".urlto($page,"")));
 	
 	my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
 	my $content="";
 	my $lasttime = 0;
 	foreach my $p (@pages) {
-		my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
-		
+		my $u=URI->new(encode_utf8($config{url}."/".urlto($p, "")));
 		my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
 		$itemtemplate->param(
@@ -407,7 +414,7 @@ sub pingurl (@) { #{{{
 
 	foreach my $page (keys %toping) {
 		my $title=pagetitle(basename($page), 0);
-		my $url="$config{url}/".htmlpage($page);
+		my $url="$config{url}/".urlto($page, "");
 		foreach my $pingurl (@{$config{pingurl}}) {
 			debug("Pinging $pingurl for $page");
 			eval {