----- Forwarded message from Mark Voorhies <mark.voorh...@ucsf.edu> -----
Date: Fri, 19 Aug 2011 16:03:02 -0700
From: Mark Voorhies <mark.voorh...@ucsf.edu>
To: Joey Hess <jo...@debian.org>
Subject: [PATCH] More informative error for failed login from bookmark.
Organization: UCSF
I'm not sure of the best way to format a patch for reportbug, so I'm
sending this patch against ikiwiki via git-format-patch. It gives a more
informative error message when login fails due to a user arriving from
a bookmark. I don't think that falling back to the previous behavior
(before commit 9dbbbd) is a good fix, since it would cause login to
fail silently for users with cookies disabled.
Thanks,
Mark
P.S. I did try filing a bug report (without the patch) via reportbug, but I'm
not sure if it made it into the Debian BTS.
---
IkiWiki/CGI.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 62383b6..975afcf 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -200,7 +200,7 @@ sub cgi_postsignin ($$) {
error(gettext("probable misconfiguration: sslcookie is
set, but you are attempting to login via http, not https"));
}
else {
- error(gettext("login failed, perhaps you need to turn
on cookies?"));
+ error(gettext("login failed, perhaps you need to turn
on cookies? If you are attempting to login from a bookmark, try clicking on
the edit link on the page that you want to edit."));
}
}
}
--
1.7.0.4
----- End forwarded message -----
--
see shy jo
signature.asc
Description: Digital signature
