From 80e8c857e31cf14bb760731715a2f854d7c72441 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Sep 2018 13:32:31 +0000 Subject: [PATCH] Bug 17530: DBRev 18.06.00.025 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_17530.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17530.perl diff --git a/Koha.pm b/Koha.pm index 5d5ddd914b..66a57c66e9 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.06.00.025"; +$VERSION = "18.06.00.026"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17530.perl b/installer/data/mysql/atomicupdate/bug_17530.perl deleted file mode 100644 index 9e2156f1c6..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17530.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q| -INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES ('ArticleRequestsLinkControl', 'always', 'always\|calc', 'Control display of article request link on search results', 'Choice') - |); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 17530 - Add pref ArticleRequestsLinkControl)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4129cc57bf..f308763a37 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16369,6 +16369,15 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19817: Add pref KohaManualLanguage and KohaManualBaseURL)\n"; } +$DBversion = '18.06.00.026'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q| +INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES ('ArticleRequestsLinkControl', 'always', 'always\|calc', 'Control display of article request link on search results', 'Choice') + |); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17530 - Add pref ArticleRequestsLinkControl)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1