fix a bug
parent
04e95f185e
commit
1081aa1ee5
|
@ -455,6 +455,7 @@ sub htmllink ($$$;$$$) { #{{{
|
||||||
if (! $noimageinline && isinlinableimage($bestlink)) {
|
if (! $noimageinline && isinlinableimage($bestlink)) {
|
||||||
return "<img src=\"$bestlink\" alt=\"$linktext\" />";
|
return "<img src=\"$bestlink\" alt=\"$linktext\" />";
|
||||||
}
|
}
|
||||||
|
|
||||||
return "<a href=\"$bestlink\">$linktext</a>";
|
return "<a href=\"$bestlink\">$linktext</a>";
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
@ -489,7 +490,8 @@ sub linkify ($$$) { #{{{
|
||||||
my $content=shift;
|
my $content=shift;
|
||||||
|
|
||||||
$content =~ s{(\\?)$config{wiki_link_regexp}}{
|
$content =~ s{(\\?)$config{wiki_link_regexp}}{
|
||||||
$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
|
defined $2
|
||||||
|
? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
|
||||||
: ( $1 ? "[[$3]]" : htmllink($lpage, $page, titlepage($3)))
|
: ( $1 ? "[[$3]]" : htmllink($lpage, $page, titlepage($3)))
|
||||||
}eg;
|
}eg;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ ikiwiki (1.44) UNRELEASED; urgency=low
|
||||||
http://openid.net/login-bg.gif into their wiki.
|
http://openid.net/login-bg.gif into their wiki.
|
||||||
* Allow setting NOTAINT=1 when building the wiki to remove taint checking
|
* Allow setting NOTAINT=1 when building the wiki to remove taint checking
|
||||||
flags, which can be useful on some hosting providers.
|
flags, which can be useful on some hosting providers.
|
||||||
|
* Fix a bug that made links like [[0|foo]] use "foo" as the link text,
|
||||||
|
instead of "0".
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Mon, 19 Feb 2007 20:08:24 -0500
|
-- Joey Hess <joeyh@debian.org> Mon, 19 Feb 2007 20:08:24 -0500
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue