From 3a0cba67f1387595f570ab9d9efdeabc856345b4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 13 Nov 2018 14:42:43 +0000 Subject: [PATCH] Bug 20356: DBRev 18.06.00.059 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql | 1 - installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql diff --git a/Koha.pm b/Koha.pm index 10ac642484..ea91c26f86 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.058"; +$VERSION = "18.06.00.059"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql b/installer/data/mysql/atomicupdate/bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql deleted file mode 100644 index e5636c3e87..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES ('EmailSMSSendDriverFromAddress', '', '', 'Email SMS send driver from address override', 'Free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index c87fac3138..998b0035cd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17059,6 +17059,14 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19349 - Add system preferences MarcFieldForCreatorId, MarcFieldForCreatorName, MarcFieldForModifierId, MarcFieldForModifierName)\n"; } +$DBversion = '18.06.00.059'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES ('EmailSMSSendDriverFromAddress', '', '', 'Email SMS send driver from address override', 'Free'); + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20356 - Add EmailSMSSendDriverFromAddress system preference)\n"; +} # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.11.0