From 0f06504422792d7132b7644caf4dabf19d957659 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Aug 2008 14:36:17 -0400 Subject: remove description_html, add link --- IkiWiki/Plugin/websetup.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'IkiWiki/Plugin/websetup.pm') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index c22516eec..8ef336b03 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -100,7 +100,16 @@ sub showfields ($$$@) { #{{{ my $key=shift @show; my %info=%{shift @show}; - my $description=exists $info{description_html} ? $info{description_html} : $info{description}; + my $description=$info{description}; + if (exists $info{link} && length $info{link}) { + if ($info{link} =~ /^\w+:\/\//) { + $description="$description"; + } + else { + $description=htmllink("", "", $info{link}, noimageinline => 1, linktext => $description); + } + } + my $value=$config{$key}; # multiple plugins can have the same field my $name=defined $plugin ? $plugin.".".$key : $key; -- cgit v1.2.3