* Corrected a bum regexp in openid munging.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d23cf5d02236e059255e1f72e292e5ccee11ab2f..5d21d0674eca2b273aaeef28e77e5c418b62531a 100644 (file)
--- 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 3b62495fd3710814cd217fb47a576294d1293bcb..3e5d7158dbc6837a821bf30f6f6f562c7b7f4325 100644 (file)
--- 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 e3a330bda77c9819b734bc3814c1005d72145983..b8565f4134eb013ad1d4441eaf5d10ab1132a907 100644 (file)
--- 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