From a131ffca088a8bf6a687cd57a7162c8511c88124 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 16 Apr 2019 12:12:11 +0000 Subject: [PATCH] Bug 22695: DBRev 18.12.00.046 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../atomicupdate/bug_22695-remove-non-xslt-results.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22695-remove-non-xslt-results.perl diff --git a/Koha.pm b/Koha.pm index 37162d9e9a..f2e64faf01 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "18.12.00.045"; +$VERSION = "18.12.00.046"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22695-remove-non-xslt-results.perl b/installer/data/mysql/atomicupdate/bug_22695-remove-non-xslt-results.perl deleted file mode 100644 index 2e29877288..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22695-remove-non-xslt-results.perl +++ /dev/null @@ -1,6 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "UPDATE systempreferences SET value = 'default' WHERE variable = 'XSLTResultsDisplay' AND value = ''" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22695 - Remove non-XSLT search results view from the staff client)\n"; -} \ No newline at end of file diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index edcddebdae..55457fbf69 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18005,6 +18005,13 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 10796 - Patron password change by category)\n"; } +$DBversion = '18.12.00.046'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE systempreferences SET value = 'default' WHERE variable = 'XSLTResultsDisplay' AND value = ''" ); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22695 - Remove non-XSLT search results view from the staff client)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1