discount markdown can't handle URIs with parens e.g. mediawiki style

[git.ikiwiki.info.git] / IkiWiki / Plugin / emailauth.pm

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index 9c595dc8643ede0a10a589bc38a968d2f635206b..becf40ca506a234082eb837f27b892b083639d54 100644 (file)
--- a/IkiWiki/Plugin/emailauth.pm
+++ b/IkiWiki/Plugin/emailauth.pm
@@ -76,7 +76,7 @@ sub email_auth ($$$$) {
        $template->param(
                wikiname => $config{wikiname},
                # Intentionally using short field names to keep link short.
-               authurl => IkiWiki::cgiurl_abs(
+               authurl => IkiWiki::cgiurl_abs_samescheme(
                        'e' => $email,
                        'v' => $token,
                ),
@@ -95,7 +95,7 @@ sub email_auth ($$$$) {
                        .">",
                Subject => "$config{wikiname} login | $shorturl",
                Message => $template->output,
-       ) or error(gettext("Failed to send mail"));
+       ) or error(sprintf(gettext("Failed to send mail: %s"), $Mail::Sendmail::error));
 
        $infodisplayer->(gettext("You have been sent an email, with a link you can open to complete the login process."));
 }