Code deduplication fin find_src_files()

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 611ba6f6540c6ae6b789bd49d477876b500b9eaf..cb1c46a68c76d51f52730372c370ea22ee8dc97b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -743,7 +743,10 @@ sub srcfile_stat {
 }
 
 sub srcfile ($;$) {
-       return (srcfile_stat(@_))[0];
+       if (my @stat=srcfile_stat(@_)) {
+               return $stat[0];
+       }
+       return undef
 }
 
 sub add_underlay ($) {
@@ -881,7 +884,7 @@ sub bestlink ($$) {
                $l.="/" if length $l;
                $l.=$link;
 
-               if (exists $links{$l}) {
+               if (exists $pagesources{$l}) {
                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {
@@ -891,7 +894,7 @@ sub bestlink ($$) {
 
        if (length $config{userdir}) {
                my $l = "$config{userdir}/".lc($link);
-               if (exists $links{$l}) {
+               if (exists $pagesources{$l}) {
                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {
@@ -1083,7 +1086,7 @@ sub htmllink ($$$;@) {
        my @attrs;
        foreach my $attr (qw{rel class title}) {
                if (defined $opts{$attr}) {
-                       push @attrs, " $attr=\"".$opts{attr}.'"';
+                       push @attrs, " $attr=\"$opts{$attr}\"";
                }
        }
 
@@ -1407,7 +1410,7 @@ sub check_content (@) {
                my %old=map { $_ => 1 }
                        split("\n", readfile(srcfile($pagesources{$params{page}})));
                foreach my $line (split("\n", $params{content})) {
-                       push @diff, $line if ! exists $old{$_};
+                       push @diff, $line if ! exists $old{$line};
                }
                $params{diff}=join("\n", @diff);
        }