aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-10-16 10:35:53 -0400
committerJoey Hess <joey@kitenet.net>2012-10-16 10:59:00 -0400
commit96bfdbf1be49b4911274569c58d523f7550c5fb1 (patch)
tree3756ba6f46a9a633cc3d7f1a802822557e38e74f /IkiWiki
parent361db207bfa9739c802784bacbf3372065a57f80 (diff)
downloadikiwiki-96bfdbf1be49b4911274569c58d523f7550c5fb1.tar
ikiwiki-96bfdbf1be49b4911274569c58d523f7550c5fb1.tar.gz
really fix diff display to not show both types of diff
12fa9c031f7a9dc25dba628aa91fc347586e4ab6 porported to fix this, but failed
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/recentchanges.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 8ce9474be..4c1863255 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -165,6 +165,7 @@ sub store ($$$) {
# Limit pages to first 10, and add links to the changed pages.
my $is_excess = exists $change->{pages}[10];
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
+ my $has_diffurl=0;
$change->{pages} = [
map {
if (length $config{cgiurl}) {
@@ -180,6 +181,9 @@ sub store ($$$) {
else {
$_->{link} = pagetitle($_->{page});
}
+ if (defined $_->{diffurl}) {
+ $has_diffurl=1;
+ }
$_;
} @{$change->{pages}}
@@ -227,6 +231,8 @@ sub store ($$$) {
wikiname => $config{wikiname},
);
+ $template->param(has_diffurl => 1) if $has_diffurl;
+
$template->param(permalink => urlto($config{recentchangespage})."#change-".titlepage($change->{rev}))
if exists $config{url};