aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-28 23:32:36 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-28 23:32:36 -0500
commit1b8f1b867c25c5287926ca538c1b04dbfc17f033 (patch)
treefd2833872ad2b5cfecf799128d5f59e628ee4e6d
parent0d2894711c6aeadcee0d4f2799a0956f7beed499 (diff)
downloadikiwiki-1b8f1b867c25c5287926ca538c1b04dbfc17f033.tar
ikiwiki-1b8f1b867c25c5287926ca538c1b04dbfc17f033.tar.gz
only linkify openids in userlink
Can't use htmllink in userlink due to it being called from recentchanges in cases where there is no configured url. It seems easist, at least for now, to not linkify user names in this case. I don't think I've ever clicked on such a link anyway. Might revisit this later.
-rw-r--r--IkiWiki.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 15402211f..b326dbdb8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -90,7 +90,7 @@ sub defaultconfig () { #{{{
adminuser => undef,
adminemail => undef,
plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit
- lockedit conditional}],
+ lockedit conditional recentchanges}],
libdir => undef,
timeformat => '%c',
locale => undef,
@@ -631,9 +631,7 @@ sub userlink ($) { #{{{
return "<a href=\"$user\">".escapeHTML($display)."</a>";
}
else {
- return htmllink("", "", escapeHTML(
- length $config{userdir} ? $config{userdir}."/".$user : $user
- ), noimageinline => 1);
+ return $user;
}
} #}}}