fix a bug

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2392c787bedc49e7c34d8c654b6e8d1ef0fb7064..d2fde957c2eb5011909200b56654a22c9eb8011b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -455,6 +455,7 @@ sub htmllink ($$$;$$$) { #{{{
        if (! $noimageinline && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";
        }
        if (! $noimageinline && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";
        }

+

        return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
 
        return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
 


@@ -489,8 +490,9 @@ sub linkify ($$$) { #{{{
        my $content=shift;
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{
        my $content=shift;
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{

-               $2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-                  : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
+               defined $2
+                       ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
+                       : ( $1 ? "[[$3]]"    : htmllink($lpage, $page, titlepage($3)))

        }eg;
        
        return $content;
        }eg;
        
        return $content;