aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-13 10:21:19 -0400
committerJoey Hess <joey@kitenet.net>2010-06-13 10:21:19 -0400
commit17592a951bf06ede47f500af25308e9c68944279 (patch)
tree5b44ea533ae227b4a05ceb352bb314abb80201ac /debian
parent89a970bd7d8cccf5362985ae293aba5626429095 (diff)
downloadikiwiki-17592a951bf06ede47f500af25308e9c68944279.tar
ikiwiki-17592a951bf06ede47f500af25308e9c68944279.tar.gz
websetup: Allow enabling plugins listed in disable_plugins.
The bug here was that disabling a plugin included thru goodstuff, like htmlscrubber, caused it to be added to disable_plugins, and those plugins were never loaded, so could not be re-enabled. Fix by allowing them to be force loaded when appropriate. (Also that allows disabled plugins to still record their setup options when dumping a setup file.)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fd7d1569e..52b727440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
else (still looks in old location for backwards compatability).
* attachment: When inserting links, insert img directives for images,
if that plugin is enabled.
+ * websetup: Allow enabling plugins listed in disable_plugins.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400