From f9e96b0c32ea7db069c718020f65174ad0bcc1d7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 2 Apr 2012 12:24:14 -0400 Subject: passwordauth: Fix url in password recovery email to be absolute. This got broken when cgiurl began often returning a relative url. Added a cgiurl_abs for the things that need a guaranteed absolute cgiurl. --- IkiWiki/Plugin/notifyemail.pm | 2 +- IkiWiki/Plugin/passwordauth.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/notifyemail.pm b/IkiWiki/Plugin/notifyemail.pm index 58f0c9920..9f5a255ae 100644 --- a/IkiWiki/Plugin/notifyemail.pm +++ b/IkiWiki/Plugin/notifyemail.pm @@ -127,7 +127,7 @@ sub notify (@) { $template->param( wikiname => $config{wikiname}, url => $url, - prefsurl => $config{cgiurl}."?do=prefs", + prefsurl => IkiWiki::cgiurl_abs(do => 'prefs'), showcontent => $showcontent, content => $content, ); diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 6a5153efd..ac955dc50 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -296,7 +296,7 @@ sub formbuilder (@) { my $template=template("passwordmail.tmpl"); $template->param( user_name => $user_name, - passwordurl => IkiWiki::cgiurl( + passwordurl => IkiWiki::cgiurl_abs( 'do' => "reset", 'name' => $user_name, 'token' => $token, -- cgit v1.2.3