X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/74409f940d24f51a08becb626e266c91d40d69bd..5a41e6054a7b0782069e4da08a6ab47ffb352392:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cd93fe969..1e9d1ca2a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2071,7 +2071,7 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
-	'&'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
+	'&'	=> sub { $_[0]->merge_influences($_[1], 1); $_[0] },
 	'|'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
 	fallback => 1,
 );
@@ -2084,7 +2084,7 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
-	'&'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
+	'&'	=> sub { $_[1]->merge_influences($_[0], 1); $_[1] },
 	'|'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
 	fallback => 1,
 );
@@ -2110,8 +2110,17 @@ sub influences_static {
 sub merge_influences {
 	my $this=shift;
 	my $other=shift;
-	foreach my $influence (keys %{$other->[1]}) {
-		$this->[1]{$influence} |= $other->[1]{$influence};
+	my $anded=shift;
+
+	if (! $anded || (($this || %{$this->[1]}) &&
+	                ($other || %{$other->[1]}))) {
+		foreach my $influence (keys %{$other->[1]}) {
+			$this->[1]{$influence} |= $other->[1]{$influence};
+		}
+	}
+	else {
+		# influence blocker
+		$this->[1]={};
 	}
 }
 
@@ -2168,7 +2177,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links")
+	return IkiWiki::FailReason->new("$page has no links", "" => 1)
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {