X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=b9acc10b5117f5233b5e6e96bad06a29c8f834db;hp=1b282abf938f63f0fa604e245ad877018e7740f2;hb=a1b90621e4fb187fe6f08b23083b5d1f57ee53b6;hpb=41369c2838b08b184b03857cc544e052e8ed379d diff --git a/ikiwiki b/ikiwiki index 1b282abf9..b9acc10b5 100755 --- a/ikiwiki +++ b/ikiwiki @@ -167,9 +167,10 @@ sub isinlinableimage ($) { $file=~/\.(png|gif|jpg|jpeg)$/; } -sub htmllink ($$) { +sub htmllink { my $page=shift; my $link=shift; + my $noimagelink=shift; my $bestlink=bestlink($page, $link); @@ -188,7 +189,7 @@ sub htmllink ($$) { $bestlink=File::Spec->abs2rel($bestlink, dirname($page)); - if (isinlinableimage($bestlink)) { + if (! $noimagelink && isinlinableimage($bestlink)) { return ""; } return "$link"; @@ -644,10 +645,10 @@ sub cgi () { my $list="