X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/38ce4c3cef71518610cb934fde171e2d4aeff99e..44c8d863398565860b2f94bbaa28f057a5199565:/IkiWiki/Plugin/inline.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fe7dde14c..70d5be235 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -46,6 +46,7 @@ sub preprocess_inline (@) { #{{{
 	} else {
 		$desc = $config{wikiname};
 	}
+	my $actions=yesno($params{actions});
 
 	my @list;
 	foreach my $page (keys %pagesources) {
@@ -94,16 +95,29 @@ sub preprocess_inline (@) { #{{{
 			# is to let the meta plugin get page title info; so stop
 			# calling this next line then once the meta plugin can
 			# store that accross runs (also tags plugin).
-			my $content=get_inline_content($page, $params{page});
+			my $content=get_inline_content($page, $params{destpage});
 			# Don't use htmllink because this way the title is separate
 			# and can be overridden by other plugins.
 			my $link=htmlpage(bestlink($params{page}, $page));
-			$link=abs2rel($link, dirname($params{page}));
+			$link=abs2rel($link, dirname($params{destpage}));
 			$template->param(pageurl => $link);
 			$template->param(title => pagetitle(basename($page)));
 			$template->param(content => $content);
 			$template->param(ctime => displaytime($pagectime{$page}));
 
+			if ($actions) {
+				my $file = $pagesources{$page};
+				my $type = pagetype($file);
+				if ($config{discussion}) {
+					$template->param(have_actions => 1);
+					$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+				}
+				if (length $config{cgiurl} && defined $type) {
+					$template->param(have_actions => 1);
+					$template->param(editurl => cgiurl(do => "edit", page => $page));
+				}
+			}
+
 			run_hooks(pagetemplate => sub {
 				shift->(page => $page, destpage => $params{page},
 					template => $template,);
@@ -144,7 +158,7 @@ sub get_inline_content ($$) { #{{{
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
 	if (defined $type) {
-		return htmlize($type,
+		return htmlize($page, $type,
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page,
@@ -185,11 +199,11 @@ sub rsspage ($) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{
-	my $desc = shift;
+	my $desc=shift;
 	my $page=shift;
 	my @pages=@_;
 	
-	my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+	my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
 	
 	my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
 	my $content="";