aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-21 14:21:40 -0400
committerJoey Hess <joey@kitenet.net>2010-04-21 14:21:40 -0400
commit0fcbcc4815042531eb58de339844a3767fb5e707 (patch)
treedf6906528d872968429298620a424e2fcf9c39e0 /IkiWiki.pm
parent34e8c78c1c9bf65564c1a3086584158e5c3cc415 (diff)
parent5c855b2bcab82e4075d49713d53869857a4e9385 (diff)
downloadikiwiki-0fcbcc4815042531eb58de339844a3767fb5e707.tar
ikiwiki-0fcbcc4815042531eb58de339844a3767fb5e707.tar.gz
Merge branch 'master' into autotag
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm18
1 files changed, 10 insertions, 8 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index adae5d8c1..5355b838d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1087,14 +1087,16 @@ sub htmllink ($$$;@) {
$bestlink=htmlpage($bestlink);
if (! $destsources{$bestlink}) {
- return $linktext unless length $config{cgiurl};
- return "<span class=\"createlink\"><a href=\"".
- cgiurl(
- do => "create",
- page => lc($link),
- from => $lpage
- ).
- "\" rel=\"nofollow\">?</a>$linktext</span>"
+ my $cgilink = "";
+ if (length $config{cgiurl}) {
+ $cgilink = "<a href=\"".
+ cgiurl(
+ do => "create",
+ page => lc($link),
+ from => $lpage
+ )."\" rel=\"nofollow\">?</a>";
+ }
+ return "<span class=\"createlink\">$cgilink$linktext</span>"
}
}