X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c494e2f97461b5b524607cef88657e0bb89add25..b31dc8d994d1cfd179c330a729dcb8bce0b293c2:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 83ed959c0..85fc1a386 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -46,6 +46,8 @@ sub page_locked ($$;$) { #{{{
 		if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
 			return 1 if $nonfatal;
 
+			#translators: The first parameter is a page name,
+			#translators: second is the user who locked it.
 			error(sprintf(gettext("%s is locked by %s and cannot be edited"),
 				htmllink("", "", $page, 1),
 				userlink($admin)));
@@ -666,9 +668,9 @@ sub userlink ($) { #{{{
 		if ($display !~ /\[/) {
 			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
 		}
-		# Convert "somehost.com/user" to "user [somehost.com]".
+		# Convert "http://somehost.com/user" to "user [somehost.com]".
 		if ($display !~ /\[/) {
-			$display=~s/^(.+)\/[^\/](.+)$/$2 [$1]/;
+			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
 		}
 		$display=~s!^https?://!!; # make sure this is removed
 		return "<a href=\"$user\">".escapeHTML($display)."</a>";