diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-05 18:20:52 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-05 18:20:52 +0000 |
| commit | b2bd444f31fd9f294ee0dbc4b9a61b1e8c04055c (patch) | |
| tree | b1ab7c05d2c2ed94dffea9a504ed46f36dfe0c96 /IkiWiki | |
| parent | fbb0762ccf7b1dcac33006424e1dee7f457210a3 (diff) | |
| download | ikiwiki-b2bd444f31fd9f294ee0dbc4b9a61b1e8c04055c.tar ikiwiki-b2bd444f31fd9f294ee0dbc4b9a61b1e8c04055c.tar.gz | |
* Allow discussion links on pages to be turned off with --no-discussion.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/brokenlinks.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/orphans.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 15 |
3 files changed, 13 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm index 8b91391fe..50bbe0d54 100644 --- a/IkiWiki/Plugin/brokenlinks.pm +++ b/IkiWiki/Plugin/brokenlinks.pm @@ -23,7 +23,7 @@ sub preprocess (@) { #{{{ foreach my $page (%IkiWiki::links) { if (IkiWiki::globlist_match($page, $params{pages})) { foreach my $link (@{$IkiWiki::links{$page}}) { - next if $link =~ /.*\/discussion/i; + next if $link =~ /.*\/discussion/i && $IkiWiki::config{discussion}; my $bestlink=IkiWiki::bestlink($page, $link); next if length $bestlink; push @broken, diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 945892d17..a7aa89f58 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -31,7 +31,7 @@ sub preprocess (@) { #{{{ next unless IkiWiki::globlist_match($page, $params{pages}); # If the page has a link to some other page, it's # indirectly linked to a page via that page's backlinks. - next if grep { length $_ && $_ !~/\/Discussion$/i && IkiWiki::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}}; + next if grep { length $_ && ($_ !~/\/Discussion$/i || ! $IkiWiki::config{discussion}) && IkiWiki::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}}; push @orphans, $page; } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 9feaa6da7..854d5105e 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -174,6 +174,9 @@ sub genpage ($$$) { #{{{ $u=~s/\[\[file\]\]/$pagesources{$page}/g; $template->param(historyurl => $u); } + if ($config{discussion}) { + $template->param(discussionlink => htmllink($page, "Discussion", 1, 1)); + } $template->param(headercontent => $config{headercontent}); $template->param( @@ -182,7 +185,6 @@ sub genpage ($$$) { #{{{ parentlinks => [parentlinks($page)], content => $content, backlinks => [backlinks($page)], - discussionlink => htmllink($page, "Discussion", 1, 1), mtime => scalar(gmtime($mtime)), styleurl => styleurl($page), ); @@ -218,9 +220,14 @@ sub findlinks ($$) { #{{{ while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) { push @links, titlepage($2); } - # Discussion links are a special case since they're not in the text - # of the page, but on its template. - return @links, "$page/discussion"; + if ($config{discussion}) { + # Discussion links are a special case since they're not in the + # text of the page, but on its template. + return @links, "$page/discussion"; + } + else { + return @links; + } } #}}} sub render ($) { #{{{ |