From 141538fb517613e7cb913c6648f2434b49909141 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 22 Nov 2016 11:38:26 +0000 Subject: [PATCH] Bug 17391 - DBRev 16.06.00.049 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_17391.sql | 2 -- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17391.sql diff --git a/Koha.pm b/Koha.pm index 1b1ee9fbfa..60ac7340ca 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 = "16.06.00.048"; +$VERSION = "16.06.00.049"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17391.sql b/installer/data/mysql/atomicupdate/bug_17391.sql deleted file mode 100644 index 3d0e7807b8..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17391.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free'); -INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 93855c50a4..5aa770b8b2 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -13646,6 +13646,22 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 17663 - Forgotten userpermissions)\n"; } +$DBversion = '16.06.00.049'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q| + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free'); + |); + + $dbh->do(q| + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free'); + |); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17391 - ReturnpathDefault and ReplyToDefault missing from syspref.sql)\n"; +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5