summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/aggregate.pm1
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 503f23ae4..21c83e34a 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -165,6 +165,7 @@ sub loadstate () { #{{{
} #}}}
sub savestate () { #{{{
+ return unless $state_loaded;
eval q{use HTML::Entities};
error($@) if $@;
my $newfile="$config{wikistatedir}/aggregate.new";
diff --git a/debian/changelog b/debian/changelog
index 6bb5f0076..7ecedf1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ ikiwiki (2.18) UNRELEASED; urgency=low
need to be able to use form values. To fix this dilemma, it's been changed
to a decode_cgi_utf8, which is called on the cgi query object, before the
form is set up, and decodes *all* cgi parameters.
+ * aggregate: Only save state if it was already loaded. This didn't used to
+ matter, but after recent changes, state is not always loaded, and saving
+ would kill it.
-- Joey Hess <joeyh@debian.org> Tue, 01 Jan 2008 18:46:59 -0500