aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-05 01:26:09 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-05 01:26:09 -0500
commit76e941a480bd0a3216a840d578a495f37643fe11 (patch)
tree2f2fa8dd1b2cd983f39ab223b6492df5de1e8433
parent41234a3f0f03b66ff2f446c2bebed6646481f017 (diff)
downloadikiwiki-76e941a480bd0a3216a840d578a495f37643fe11.tar
ikiwiki-76e941a480bd0a3216a840d578a495f37643fe11.tar.gz
* aggregate: Only save state if it was already loaded.
-rw-r--r--IkiWiki/Plugin/aggregate.pm1
-rw-r--r--debian/changelog1
2 files changed, 2 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..049b78cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ 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.
-- Joey Hess <joeyh@debian.org> Tue, 01 Jan 2008 18:46:59 -0500