Fix handling of pref defaults (#3747, #3588)

diff --git a/admin/preferences.pl b/admin/preferences.pl
index c359d32..146fe3f 100755 (executable)
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -126,9 +126,9 @@ sub TransformPrefsToHTML {
                     my $name = $piece->{'pref'};
 
                     if ( $name ) {
-                        my $row = $dbh->selectrow_hashref( "SELECT value FROM systempreferences WHERE variable = ?", {}, $name );
+                        my $row = $dbh->selectrow_hashref( "SELECT value, type FROM systempreferences WHERE variable = ?", {}, $name );
                         my $value;
-                        if ( !defined( $row ) && defined( $piece->{'default'} ) ) {
+                        if ( ( !defined( $row ) || ( !defined( $row->{'value'} ) && $row->{'type'} ne 'YesNo' ) ) && defined( $piece->{'default'} ) ) {
                             $value = $piece->{'default'};
                         } else {
                             $value = $row->{'value'};

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index a4b2fd8..5bdc1e6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -70,7 +70,7 @@ Cataloging:
                   incremental: generated in the form 1, 2, 3.
                   annual: generated in the form <year>-0001, <year>-0002.
                   hbyymmincr: generated in the form <branchcode>yymm0001.
-                  OFF: not generated automatically.
+                  "OFF": not generated automatically.
     Display:
         -
             - 'Separate multiple displayed authors, series or subjects with '

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index c207cd1..3ff3628 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -1,4 +1,4 @@
-Patron:
+Patrons:
      -
          - List
          - pref: AddPatronLists
@@ -13,6 +13,7 @@ Patron:
                no: "Don't send"
          - an email to newly created patrons with their account details at their
          - pref: AutoEmailPrimaryAddress
+           default: "OFF"
            choices:
                email: home
                emailpro: work