From 1c614914cc7b5fe187298dad88bafa0bdf8f106c Mon Sep 17 00:00:00 2001
From: "smcv@" <smcv@>
Date: Fri, 10 Jul 2009 18:56:47 +0100
Subject: [PATCH] Close bug (joeyh merged my patch), split out feature request,
 provide alternative patch

---
 ...penid_no_longer_pretty-prints_OpenIDs.mdwn | 22 ++++-------------
 ...tty-print_OpenIDs_even_if_not_enabled.mdwn | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn

diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
index 1e2030b23..85a206bc0 100644
--- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
+++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
@@ -8,22 +8,10 @@ The git commit (in my `openid` branch) says it all:
 
 This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]).
 
-> Cherry picked, thanks. --[[Joey]] 
+> Cherry picked, thanks. --[[Joey]]
 
-Relatedly, the other commit on the same branch would be nice to have:
+Relatedly, the other commit on the same branch would be nice to have
+(edited to add: I've now moved it, and its discussion, to
+[[todo/pretty-print_OpenIDs_even_if_not_enabled]]). --[[smcv]]
 
-    Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser
-    
-    On various sites I have two IkiWiki instances running from the same
-    repository: one accessible via http and only accepting openid logins,
-    and one accessible via authenticated https and only accepting httpauth.
-    Ideally, the https version should still pretty-print OpenIDs seen in
-    git history.
-
---[[smcv]]
-
-> I wonder if an option is the best approach. Maybe it would be better to
-> simply move `openiduser` into `userlink`, and thus always support openid
-> usernames whether the plugin is enabled or not. --[[Joey]] 
-
-[[!tag patch]]
+[[!tag done]]
diff --git a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn
new file mode 100644
index 000000000..373c120a6
--- /dev/null
+++ b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn
@@ -0,0 +1,24 @@
+A feature I originally requested on
+[[a_related_bug|bugs/openid_no_longer_pretty-prints_OpenIDs]]:
+
+    Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser
+    
+    On various sites I have two IkiWiki instances running from the same
+    repository: one accessible via http and only accepting openid logins,
+    and one accessible via authenticated https and only accepting httpauth.
+    Ideally, the https version should still pretty-print OpenIDs seen in
+    git history.
+
+--[[smcv]]
+
+> I wonder if an option is the best approach. Maybe it would be better to
+> simply move `openiduser` into `userlink`, and thus always support openid
+> usernames whether the plugin is enabled or not. --[[Joey]]
+
+>> OK, implemented that as 'smcv/always-openid'; if you don't think that's
+>> bloating the IkiWiki core too much, please consider merging. The poll on
+>> [[news/openid]] indicates fairly strong support for *only* accepting OpenID
+>> logins, so I think recognising OpenIDs can reasonably be considered core
+>> functionality! --[[smcv]]
+
+[[!tag patch]]
-- 
2.44.0