web commit by JoshTriplett: Re-add link to article in LinuxWorld.com.

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c272a294e9e912e6be2b7d6e5093795b069118bc..37ff792d124369f3804dedbc4c41be04e0b0a711 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -549,8 +549,14 @@ sub linkify ($$$) { #{{{
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{
                defined $2
-                       ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4, linktext => pagetitle($2)))
-                       : ( $1 ? "[[$3]]"    : htmllink($lpage, $page, linkpage($3), anchor => $4))
+                       ? ( $1 
+                               ? "[[$2|$3".(length $4 ? "#$4" : "")."]]" 
+                               : htmllink($lpage, $page, linkpage($3),
+                                       anchor => $4, linktext => pagetitle($2)))
+                       : ( $1 
+                               ? "[[$3".(length $4 ? "#$4" : "")."]]"
+                               : htmllink($lpage, $page, linkpage($3),
+                                       anchor => $4))
        }eg;
        
        return $content;
@@ -1027,6 +1033,7 @@ sub match_link ($$$) { #{{{
        my $links = $IkiWiki::links{$page} or return undef;
        return 0 unless @$links;
        my $bestlink = IkiWiki::bestlink($from, $link);
+       return 0 unless length $bestlink;
        foreach my $p (@$links) {
                return 1 if $bestlink eq IkiWiki::bestlink($page, $p);
        }