From 75a9f6a4a0e17c18f8a1bd805f9e0ed5f59ccec7 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 27 Oct 2014 10:43:23 -0300 Subject: [PATCH] Bug 9530: DBRev 3.17.00.032 Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/updatedatabase.pl | 29 +++++++++++++------------- kohaversion.pl | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 2d65e5ad88..79cccee60c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8779,21 +8779,6 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 12728: Checked syspref StatisticsFields)\n"; } -$DBversion = "3.17.00.XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do( -"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free')" - ); - $dbh->do( -"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free')" - ); - $dbh->do("ALTER TABLE branches ADD branchreplyto mediumtext AFTER branchemail"); - $dbh->do("ALTER TABLE branches ADD branchreturnpath mediumtext AFTER branchreplyto"); - print -"Upgrade to $DBversion done (Bug XXX Adding replyto and returnpath addresses.)\n"; - SetVersion($DBversion); -} - $DBversion = "3.17.00.026"; if ( CheckVersion($DBversion) ) { if ( C4::Context->preference('marcflavour') eq 'MARC21' ) { @@ -8859,6 +8844,20 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.17.00.032"; +if ( CheckVersion($DBversion) ) { + $dbh->do( +"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free')" + ); + $dbh->do( +"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free')" + ); + $dbh->do("ALTER TABLE branches ADD branchreplyto mediumtext AFTER branchemail"); + $dbh->do("ALTER TABLE branches ADD branchreturnpath mediumtext AFTER branchreplyto"); + print "Upgrade to $DBversion done (Bug 9530: Adding replyto and returnpath addresses.)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/kohaversion.pl b/kohaversion.pl index 08e88ded22..aaf3a814d8 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.17.00.031'; + our $VERSION = '3.17.00.032'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 2.39.5