X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/61c909e2f28758baa7089649f2ae2569213e8eac..d9f1b1214926832793103adef926c0bccc833b48:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e6d0bc510..504edc843 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -9,7 +9,8 @@ sub linkify ($$) { #{{{
 	my $page=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$1 ? "[[$2]]" : htmllink($page, $2)
+		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($page, $3, 0, 0, pagetitle($2)))
+		   : ( $1 ? "[[$3]]" :    htmllink($page, $3))
 	}eg;
 	
 	return $content;
@@ -215,7 +216,7 @@ sub genpage ($$$) { #{{{
 	}
 
 	if ($config{rss} && $inlinepages{$page}) {
-		$template->param(rssurl => rsspage($page));
+		$template->param(rssurl => rsspage(basename($page)));
 	}
 	
 	$template->param(
@@ -266,8 +267,6 @@ sub genrss ($$$) { #{{{
 		my $parentpage=shift;
 		my %params=@_;
 		
-		return "" if exists $params{archive} && $params{archive} eq 'yes';
-		
 		if (! exists $params{show}) {
 			$params{show}=10;
 		}
@@ -326,7 +325,7 @@ sub findlinks ($$) { #{{{
 
 	my @links;
 	while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-		push @links, lc($1);
+		push @links, lc($2);
 	}
 	# Discussion links are a special case since they're not in the text
 	# of the page, but on its template.