In preferences, allow the subscriptions and email fields to be cleared

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8809e85106407a98d801f1717da76a931f5ba14d..65a1d7fa08c00c36c08cbda7ec0e82b5f323222e 100644 (file)
--- 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)) {
        }
        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");
                        }
                                userinfo_set($user_name, $field, $form->field($field)) ||
                                        error("failed to set $field");
                        }

diff --git a/debian/changelog b/debian/changelog
index d115efafcad9601df6923980978d7315bb658f20..aac85eb00cc45c07549e95febe597288f9c54dc1 100644 (file)
--- 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
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 09 Jan 2008 00:34:46 -0500
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 73fd91b851289f1a1ff2580b9e884e91b5d54a31..58f79673babfcb60657e2cd779d413ea87e08544 100644 (file)
--- 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"
 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"
 "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.
 #. 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 ""
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""