new version of the patch available on my git repo

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ac01ea4180c25224892ba8a5cfa1d807df67c1af..99d5724ebca49593ac1078bb8880d00de510128f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1081,11 +1081,10 @@ sub htmllink ($$$;@) {
        }
 
        my @attrs;
        }
 
        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 "<a href=\"$bestlink\"@attrs>$linktext</a>";
        }
 
        return "<a href=\"$bestlink\"@attrs>$linktext</a>";


@@ -2120,10 +2119,7 @@ sub merge_influences {
        }
        else {
                # influence blocker
        }
        else {
                # influence blocker

-               print STDERR "merging $this and $other; found influence blocker\n";

                $this->[1]={};
                $this->[1]={};

-               $this->[2]=1;
-               return;

        }
 }
 
        }
 }