aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-13 18:44:11 -0400
committerJoey Hess <joey@kitenet.net>2011-05-13 18:44:11 -0400
commitb3720582abc46974715d019aa07d78828bc23062 (patch)
treec795d108dd3cc7a11eb25057299284fdfd8833e4 /IkiWiki/Plugin
parentaccd2491d8388350c5498cd4dcbcdf57c15f6486 (diff)
downloadikiwiki-b3720582abc46974715d019aa07d78828bc23062.tar
ikiwiki-b3720582abc46974715d019aa07d78828bc23062.tar.gz
allow for a html formatted description in websetup
w/o polluting setup file with the html
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/websetup.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0a3d90aec..f95017c90 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -151,7 +151,10 @@ sub showfields ($$$@) {
my %info=%{shift @show};
my $description=$info{description};
- if (exists $info{link} && length $info{link}) {
+ if (exists $info{htmldescription}) {
+ $description=$info{htmldescription};
+ }
+ elsif (exists $info{link} && length $info{link}) {
if ($info{link} =~ /^\w+:\/\//) {
$description="<a href=\"$info{link}\">$description</a>";
}