urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inline: moved rootpage logic to a function 

The po plugin's injected bestlink must do something special when called by this
exact part of inline's code.

Signed-off-by: intrigeri <intrigeri@boum.org>
master
intrigeri 2009-08-28 13:56:03 +02:00
parent c9301d2c29
commit 72ac9821e5
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
IkiWiki/Plugin/inline.pm
View File

@ -307,17 +307,7 @@ sub preprocess_inline (@) {
# Add a blog post form, with feed buttons. # Add a blog post form, with feed buttons.
my $formtemplate=template("blogpost.tmpl", blind_cache => 1); my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
$formtemplate->param(cgiurl => $config{cgiurl}); $formtemplate->param(cgiurl => $config{cgiurl});
my $rootpage; $formtemplate->param(rootpage => rootpage(%params));
if (exists $params{rootpage}) {
$rootpage=bestlink($params{page}, $params{rootpage});
if (!length $rootpage) {
$rootpage=$params{rootpage};
}
}
else {
$rootpage=$params{page};
}
$formtemplate->param(rootpage => $rootpage);
$formtemplate->param(rssurl => $rssurl) if $feeds && $rss; $formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
$formtemplate->param(atomurl => $atomurl) if $feeds && $atom; $formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
if (exists $params{postformtext}) { if (exists $params{postformtext}) {
@ -654,4 +644,21 @@ sub pingurl (@) {
exit 0; # daemon done exit 0; # daemon done
} }
sub rootpage (@) {
my %params=@_;
my $rootpage;
if (exists $params{rootpage}) {
$rootpage=bestlink($params{page}, $params{rootpage});
if (!length $rootpage) {
$rootpage=$params{rootpage};
}
}
else {
$rootpage=$params{page};
}
return $rootpage;
}
1 1