Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index bc9311d9c04aec49b1db6f269663bc52b379391b..f12cbdaa37fad0c77ada865a521ff68a0d95e785 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -23,9 +23,12 @@ sub getopt () { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },

                openidsignup => {
                        type => "string",
                openidsignup => {
                        type => "string",

-                       default => "",

                        example => "http://myopenid.com/",
                        description => "an url where users can signup for an OpenID",
                        safe => 1,
                        example => "http://myopenid.com/",
                        description => "an url where users can signup for an OpenID",
                        safe => 1,


@@ -45,7 +48,7 @@ sub formbuilder_setup (@) { #{{{
                # needing to depend on it.
                eval q{use Net::OpenID::Consumer};
                if ($@) {
                # needing to depend on it.
                eval q{use Net::OpenID::Consumer};
                if ($@) {

-                       debug("unable to load Net::OpenID::Consumer, not enabling OpenID login");
+                       debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)");

                        return;
                }
 
                        return;
                }