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

refactor

master
Joey Hess 2010-05-05 22:41:23 -04:00
parent ee9a4e06fc
commit cb2025af45
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki.pm
View File

@ -1748,16 +1748,12 @@ sub misctemplate ($$;@) {
$template->param( $template->param(
dynamic => 1, dynamic => 1,
have_actions => 0, # force off
title => $title, title => $title,
wikiname => $config{wikiname}, wikiname => $config{wikiname},
content => $content, content => $content,
baseurl => baseurl(), baseurl => baseurl(),
html5 => $config{html5}, html5 => $config{html5},
have_actions => 0, # force off
parentlinks => [{ # override
url => $config{url},
page => $config{wikiname},
}],
@_, @_,
); );

11
IkiWiki/Plugin/parentlinks.pm
View File

@ -23,6 +23,14 @@ sub getsetup () {
sub parentlinks ($) { sub parentlinks ($) {
my $page=shift; my $page=shift;
if (! length $page) {
# dynamic page
return {
url => $config{url},
page => $config{wikiname},
};
}
my @ret; my @ret;
my $path=""; my $path="";
my $title=$config{wikiname}; my $title=$config{wikiname};
@ -53,12 +61,11 @@ sub parentlinks ($) {
sub pagetemplate (@) { sub pagetemplate (@) {
my %params=@_; my %params=@_;
my $page=$params{page};
my $template=$params{template}; my $template=$params{template};
if ($template->query(name => "parentlinks") || if ($template->query(name => "parentlinks") ||
$template->query(name => "has_parentlinks")) { $template->query(name => "has_parentlinks")) {
my @links=parentlinks($page); my @links=parentlinks($params{page});
$template->param(parentlinks => \@links); $template->param(parentlinks => \@links);
$template->param(has_parentlinks => (@links > 0)); $template->param(has_parentlinks => (@links > 0));
} }