aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Render.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-21 19:47:38 -0400
committerJoey Hess <joey@kitenet.net>2010-04-21 19:47:38 -0400
commit789e68a8b1a451133d9308ecd800140e2ed6f626 (patch)
tree752f955bd5dd421891ec423ebabef07a8712cc5b /IkiWiki/Render.pm
parent8cde2365e43f1c96432dcedb378be55d2308dd08 (diff)
parent77779dc4a09a9b686935e8e615cf2502f7125bb4 (diff)
downloadikiwiki-789e68a8b1a451133d9308ecd800140e2ed6f626.tar
ikiwiki-789e68a8b1a451133d9308ecd800140e2ed6f626.tar.gz
Merge branch 'master' into autotag
Conflicts: IkiWiki/Plugin/tag.pm
Diffstat (limited to 'IkiWiki/Render.pm')
-rw-r--r--IkiWiki/Render.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c3e07baf6..49d080c16 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -517,7 +517,7 @@ sub link_types_changed ($$) {
my $old = shift;
return 0 if !defined $new && !defined $old;
- return 1 if !defined $new || !defined $old;
+ return 1 if (!defined $new && %$old) || (!defined $old && %$new);
while (my ($type, $links) = each %$new) {
foreach my $link (keys %$links) {