X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a20bc7a3fc6a2f2369022873ef7c2afbd5e49105..bac8bc027d4a1bb262300be2323ae4093c193e5b:/IkiWiki.pm?ds=inline diff --git a/IkiWiki.pm b/IkiWiki.pm index ac01ea418..99d5724eb 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1081,11 +1081,10 @@ sub htmllink ($$$;@) { } my @attrs; - if (defined $opts{rel}) { - push @attrs, ' rel="'.$opts{rel}.'"'; - } - if (defined $opts{class}) { - push @attrs, ' class="'.$opts{class}.'"'; + foreach my $attr (qw{rel class title}) { + if (defined $opts{$attr}) { + push @attrs, " $attr=\"$opts{$attr}\""; + } } return "$linktext"; @@ -2120,10 +2119,7 @@ sub merge_influences { } else { # influence blocker - print STDERR "merging $this and $other; found influence blocker\n"; $this->[1]={}; - $this->[2]=1; - return; } }