From 4cd57521c43f4e8c5e37ec61e1112ff2b74453ad Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Sep 2018 13:09:42 +0000 Subject: [PATCH] Bug 19817: DBRev 18.06.00.025 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_19817.sql | 5 ----- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_19817.sql diff --git a/Koha.pm b/Koha.pm index 23404400e6..5d5ddd914b 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.024"; +$VERSION = "18.06.00.025"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_19817.sql b/installer/data/mysql/atomicupdate/bug_19817.sql deleted file mode 100644 index 554fd6764f..0000000000 --- a/installer/data/mysql/atomicupdate/bug_19817.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) -VALUES ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'); - -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) -VALUES ('KohaManualLanguage','en','en|ar|cs|es|de|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0287596598..4129cc57bf 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16358,6 +16358,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 7534 - Let libraries have configuration for pickup locations)\n"; } +$DBversion = '18.06.00.025'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'), + ('KohaManualLanguage','en','en|ar|cs|es|de|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 19817: Add pref KohaManualLanguage and KohaManualBaseURL)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.2