web commit by http://joey.kitenet.net/: mail bug fixed, final test

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 54c526c2cbf6402b4cf8205d6cb1caef8db48dac..b90b43d8dc37a825ec680ca0a763330d66ca52d1 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -657,8 +657,9 @@ sub userlink ($) { #{{{
                my $display=$oid->display;
                # Convert "user.somehost.com" to "user [somehost.com]".
                if ($display !~ /\[/) {
-                       $display=~s/^(.*?)\.([^.]+.[^.]+)$/$1 [$2]/;
+                       $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
                }
+               $display=~s!^https?://!!; # make sure this is removed
                return "<a href=\"$user\">".escapeHTML($display)."</a>";
        }
        else {