Fix cookiejar default setting.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 75c95793218384bd034914d574e63464f739fd31..87ddb1b5643dc279a5a5ea037b9c7ce398d69ba2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -515,9 +515,8 @@ sub getsetup () {
        },
        cookiejar => {
                type => "string",
        },
        cookiejar => {
                type => "string",

-               default => "$ENV{HOME}/.ikiwiki/cookies",
+               default => { file => "$ENV{HOME}/.ikiwiki/cookies" },

                description => "cookie control",
                description => "cookie control",

-               example => { file => "$ENV{HOME}/.ikiwiki/cookies" },

                safe => 0, # hooks into perl module internals
                rebuild => 0,
        },
                safe => 0, # hooks into perl module internals
                rebuild => 0,
        },

diff --git a/debian/changelog b/debian/changelog
index 8b62b0420071c92df5f515846f53f8f6fbfcfaad..9011549828b2879f662d538a88e96ef643047a3e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20130904.1) UNRELEASED; urgency=low
+
+  * Fix cookiejar default setting.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 04 Sep 2013 10:14:16 -0400
+

 ikiwiki (3.20130904) unstable; urgency=low
 
   * calendar: Display the popup mouseover when there is only 1 page for a
 ikiwiki (3.20130904) unstable; urgency=low
 
   * calendar: Display the popup mouseover when there is only 1 page for a