X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c4f3d0554a02eba93d94d4c0914f4afddf85274b..cdc3576c8d1efb2593cac2d9da3f2393a2afe26e:/IkiWiki/Plugin/calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index d473c8348..5d16dff75 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -211,8 +211,10 @@ EOF
 	# matching the pagespec are added or removed.
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently linked pages as dependencies, so
-        # that if they are removed, the calendar will be sure to be updated.
-        add_depends($params{page}, join(" or ", @list));
+	# that if they are removed, the calendar will be sure to be updated.
+	foreach my $p (@list) {
+		add_depends($params{page}, $p);
+	}
 
 	return $calendar;
 }
@@ -369,8 +371,7 @@ sub preprocess (@) {
 	my $page =$params{page};
 
 	if (! defined $cache{$pagespec}) {
-		foreach my $p (keys %pagesources) {
-			next unless pagespec_match($p, $pagespec);
+		foreach my $p (pagespec_match_list([keys %pagesources], $pagespec)) {
 			my $mtime = $IkiWiki::pagectime{$p};
 			my $src   = $pagesources{$p};
 			my @date  = localtime($mtime);