bugfixen

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b031aef56d4b744242c10f690f8cd3684c4b121a..b90b43d8dc37a825ec680ca0a763330d66ca52d1 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -654,7 +654,13 @@ sub userlink ($) { #{{{
            eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
                # Munge user-urls, as used by eg, OpenID.
                my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
            eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
                # Munge user-urls, as used by eg, OpenID.
                my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);

-               return "<a href=\"$user\">".escapeHTML($oid->display)."</a>";
+               my $display=$oid->display;
+               # Convert "user.somehost.com" to "user [somehost.com]".
+               if ($display !~ /\[/) {
+                       $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
+               }
+               $display=~s!^https?://!!; # make sure this is removed
+               return "<a href=\"$user\">".escapeHTML($display)."</a>";

        }
        else {
                return htmllink("", "", escapeHTML($user), 1);
        }
        else {
                return htmllink("", "", escapeHTML($user), 1);