From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 20 Nov 2006 06:22:19 +0000 (+0000)
Subject: minor improvements
X-Git-Tag: 1.34~129
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7ee388ea1eb9b0c9625df828a3f565636acbc9c;p=ikiwiki.git

minor improvements
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3803bb917..9925c247a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -30,7 +30,7 @@ sub defaultconfig () { #{{{
 	wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$|\.atom$|.arch-ids/|{arch}/)},
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
-	web_commit_regexp => qr/^web commit (by (.*?(?=: )|[^:]+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+	web_commit_regexp => qr/^web commit (by (.*?(?=: |$)|[^:]+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
 	verbose => 0,
 	syslog => 0,
 	wikiname => "wiki",
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9315c290a..c399ad8a6 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -160,7 +160,7 @@ sub cgi_signin ($$) { #{{{
 	$form->field(name => "password", type => "password", required => 0);
 	if ($config{openid}) {
 		$form->field(name => "openid_url", label => "OpenID",
-			comment => htmllink("", "", "OpenID", 1, 0, "What's this?"));
+			comment => '('.htmllink("", "", "OpenID", 1, 0, "What's this?").')');
 	}
 	else {
 		$form->field(name => "openid_url", type => "hidden");