Bug 22695: DBRev 18.12.00.046

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 37162d9..f2e64fa 100644 (file)
--- 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 (file)
index 2e29877..0000000
--- 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 edcddeb..55457fb 100755 (executable)
--- 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.