aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-09 17:59:56 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-09 17:59:56 -0500
commit141d36388836d2fba71b5aa206d944df3cca3eac (patch)
treedae17a2c7f94ca810e13666baca9f1e5cd39398a
parent14002b58d2aa9b20b541f75287bac38b40677ba7 (diff)
downloadikiwiki-141d36388836d2fba71b5aa206d944df3cca3eac.tar
ikiwiki-141d36388836d2fba71b5aa206d944df3cca3eac.tar.gz
In preferences, allow the subscriptions and email fields to be cleared
-rw-r--r--IkiWiki/CGI.pm2
-rw-r--r--debian/changelog5
-rw-r--r--po/ikiwiki.pot4
3 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8809e8510..65a1d7fa0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -275,7 +275,7 @@ sub cgi_prefs ($$) { #{{{
}
elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
foreach my $field (qw(email subscriptions)) {
- if (defined $form->field($field) && length $form->field($field)) {
+ if (defined $form->field($field)) {
userinfo_set($user_name, $field, $form->field($field)) ||
error("failed to set $field");
}
diff --git a/debian/changelog b/debian/changelog
index d115efafc..aac85eb00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ ikiwiki (2.20) UNRELEASED; urgency=low
via `<TMPL_VAR raw_variable>`.
* When htmlizing text, if the input is a single line with no newline,
and the htmlizer (such as markdown and textile) generates a html
- paragraph, remove it. This allows removing several hacks around this
- markdown behavior from other plugins that htmlize fragements of pages.
+ paragraph, remove it. This allows removing several hacks from other
+ plugins that htmlize fragements of pages.
+ * In preferences, allow the subscriptions and email fields to be cleared.
-- Joey Hess <joeyh@debian.org> Wed, 09 Jan 2008 00:34:46 -0500
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 73fd91b85..58f79673b 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-09 14:31-0500\n"
+"POT-Creation-Date: 2008-01-09 14:43-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -648,7 +648,7 @@ msgstr ""
#. translators: preprocessor directive name,
#. translators: the second a page name, the
#. translators: third a number.
-#: ../IkiWiki.pm:722
+#: ../IkiWiki.pm:732
#, perl-format
msgid "%s preprocessing loop detected on %s at depth %i"
msgstr ""