projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
557912c
)
indent
author
Joey Hess
<joey@kitenet.net>
Thu, 22 Apr 2010 01:38:53 +0000
(21:38 -0400)
committer
Joey Hess
<joey@kitenet.net>
Thu, 22 Apr 2010 01:38:53 +0000
(21:38 -0400)
IkiWiki.pm
patch
|
blob
|
history
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index 8af290745283a5bc86c45cc4bffb9e156cda5a05..0791e1e755911ef4659bd2b509abde467e99a426 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-2221,7
+2221,7
@@
sub merge_influences {
my $anded=shift;
if (! $anded || (($this || %{$this->[1]}) &&
- ($other || %{$other->[1]}))) {
+
($other || %{$other->[1]}))) {
foreach my $influence (keys %{$other->[1]}) {
$this->[1]{$influence} |= $other->[1]{$influence};
}