* Fix link() PageSpecs to not just look at the raw link text, but at where

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4dbf9f159605aeaccd0e9379061e6a06c2e3a1a1..3a2e0a05f340362ffc29f2dabfdfa3605dbe7500 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -121,11 +121,13 @@ sub preprocess_inline (@) { #{{{
        my $atomurl=atompage(basename($params{page}));
        my $ret="";
 
-       if (exists $params{rootpage} && $config{cgiurl}) {
+       if ($config{cgiurl} && (exists $params{rootpage} ||
+                       (exists $params{postform} && yesno($params{postform})))) {
                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
-               $formtemplate->param(rootpage => $params{rootpage});
+               $formtemplate->param(rootpage => 
+                       exists $params{rootpage} ? $params{rootpage} : $params{page});
                $formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
                $formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
                $ret.=$formtemplate->output;