aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-09 16:27:08 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-09 16:27:08 -0500
commit1f51af907e93ee45b01a4a7f6015575522a3105d (patch)
treeeaa5a0dfb0a8a907cbc3ea7f226a1a4e22021cdb
parent9dbeb003df73ff04fe608558004a6bfe4e3eaf78 (diff)
downloadikiwiki-1f51af907e93ee45b01a4a7f6015575522a3105d.tar
ikiwiki-1f51af907e93ee45b01a4a7f6015575522a3105d.tar.gz
websetup: Fix bug in array change detection.
-rw-r--r--IkiWiki/Plugin/websetup.pm6
-rw-r--r--debian/changelog1
2 files changed, 6 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 75aa3681c..e477bcc20 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -362,7 +362,11 @@ sub showform ($$) {
@value=sort grep { length $_ } @value;
my @oldvalue=sort grep { length $_ }
(defined $config{$key} ? @{$config{$key}} : ());
- if ((@oldvalue) == (@value)) {
+ my $same=(@oldvalue) == (@value);
+ for (my $x=0; $same && $x < @value; $x++) {
+ $same=0 if $value[$x] ne $oldvalue[$x];
+ }
+ if ($same) {
delete $rebuild{$field};
}
else {
diff --git a/debian/changelog b/debian/changelog
index 5d5cdd564..bd638b36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
* comments: Fix permalinks for comments using new conflict-free filenames.
* img: Support alignment of images with captions. (Giuseppe Bilotta)
* websetup: Fix utf-8 problems.
+ * websetup: Fix bug in array change detection.
-- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500