From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 3 Jan 2007 05:33:50 +0000 (+0000)
Subject: * Corrected a bum regexp in openid munging.
X-Git-Tag: 1.38~37
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=e5348d2d70cf7a56f59f019b4adfbd4324212305

* Corrected a bum regexp in openid munging.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d23cf5d02..5d21d0674 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -668,7 +668,7 @@ sub userlink ($) { #{{{
 		}
 		# Convert "http://somehost.com/user" to "user [somehost.com]".
 		if ($display !~ /\[/) {
-			$display=~s/^https?:\/\/(.+)\/[^\/](.+)$/$2 [$1]/;
+			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
 		}
 		$display=~s!^https?://!!; # make sure this is removed
 		return "<a href=\"$user\">".escapeHTML($display)."</a>";
diff --git a/debian/changelog b/debian/changelog
index 3b62495fd..3e5d7158d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.38) UNRELEASED; urgency=low
+
+  * Corrected a bum regexp in openid munging.
+
+ -- Joey Hess <joeyh@debian.org>  Tue,  2 Jan 2007 16:30:48 -0500
+
 ikiwiki (1.37) unstable; urgency=low
 
   * Add mirrorlist plugin.
diff --git a/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn b/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
index e3a330bda..b8565f413 100644
--- a/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
+++ b/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
@@ -18,6 +18,8 @@ for all OpenIDs is a good idea. What's your opinion?
 >>>> instead of "ptecza [getopenid.com]" (you cut first character of my login).
 >>>> --Pawel
 
+>>>>> fixed now
+
 BTW, Happy New Year for you and Debian 'etch' and all ikiwiki
 users! :) --Pawel