@@ -, +, @@ --- installer/data/mysql/atomicupdate/bug_22774.perl | 4 ++-- .../prog/en/modules/admin/preferences/opac.pref | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_22774.perl +++ a/installer/data/mysql/atomicupdate/bug_22774.perl @@ -3,8 +3,8 @@ if( CheckVersion( $DBversion ) ) { # you can use $dbh here like: $dbh->do( q{ INSERT IGNORE INTO systempreferences (variable,value,explanation,type) VALUES - ('MaxTotalSuggestions','3','Number of total suggestions','free'), - ('NumberOfSuggestionDays','30','days','free') + ('MaxTotalSuggestions','','Number of total suggestions','Free'), + ('NumberOfSuggestionDays','','days','Free') }); # or perform some test and warn --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -701,28 +701,12 @@ OPAC: - pref: MaxOpenSuggestions class: integer - "open suggestions. Leave empty for no limit. **Note: this setting does not affect anonymous suggestions" -<<<<<<< HEAD -======= - - Number of total suggestions - pref: MaxTotalSuggestions - default: 3 class: integer - "for" - pref: NumberOfSuggestionDays - default: 30 - class: integer - - "days." - Privacy: ->>>>>>> Bug 22774: New systempreferences for suggestions - - - - Number of total suggestions - - pref: MaxTotalSuggestions - default: 3 - class: integer - - "for" - - pref: NumberOfSuggestionDays - default: 30 class: integer - "days." Privacy: --