minor improvements

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3803bb917e2bc671bbe6344e408594d52ca56110..9925c247af0bdf12b1972172bfcbe0d706cb4265 100644 (file)
--- 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 9315c290a22d0972a6341aaf1b1ab24ac9f8468d..c399ad8a6c414de4af8b374918542398a1e84ce2 100644 (file)
--- 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");