From dcbcf8815cf6702d9120700c35a88d5ae3946a08 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 21 Oct 2010 22:17:15 -0400 Subject: [PATCH] bug 3881: remove unused OpacPrivacy syspref Signed-off-by: Galen Charlton --- admin/systempreferences.pl | 1 - installer/data/mysql/updatedatabase.pl | 9 ++++++++- .../prog/en/modules/admin/preferences/opac.pref | 7 ------- kohaversion.pl | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 58f8ac7377..d7d7413faf 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -110,7 +110,6 @@ $tabsysprefs{noOPACUserLogin} = "Admin"; $tabsysprefs{'OAI-PMH:ConfFile'} = "Admin"; $tabsysprefs{OpacAddMastheadLibraryPulldown} = "Admin"; $tabsysprefs{opaclargeimage} = "Admin"; -$tabsysprefs{OpacPrivacy} = "Admin"; $tabsysprefs{OPACXSLTDetailsDisplay} = "Admin"; $tabsysprefs{OPACXSLTResultsDisplay} = "Admin"; $tabsysprefs{PDFFontType} = "Admin"; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index cf0c407b83..11f6c5a826 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4,7 +4,7 @@ # Database Updater # This script checks for required updates to the database. -# Part of the Koha Library Software www.koha.org +# Part of the Koha Library Software www.koha-community.org # Licensed under the GPL. # Bugs/ToDo: @@ -3776,6 +3776,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.02.00.002"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do(q{DELETE FROM systempreferences WHERE variable = 'OpacPrivacy'}); + print "Upgrade to $DBversion done (bug 3881: remove unused OpacPrivacy system preference)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index a3b0bf1655..c844df4738 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -299,10 +299,3 @@ OPAC: yes: Keep no: "Don't keep" - patron search history in the OPAC. - - - - pref: OpacPrivacy - default: 0 - choices: - yes: Allow - no: "Don't allow" - - patrons to opt-in/opt-out of saving their reading/circulation history. diff --git a/kohaversion.pl b/kohaversion.pl index b231acdca4..0f676dc4e0 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.02.00.001'; + our $VERSION = '3.02.00.002'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 2.20.1