From 8e4c7a3f3b0aab1ad2fd4c75008ceab23dcbc639 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 29 Apr 2015 11:30:34 -0300 Subject: [PATCH] Bug 4041: DBRev 3.19.00.032 Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/updatedatabase.pl | 18 ++++++++++-------- kohaversion.pl | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 348e6a85fd..a354b9fae5 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9980,14 +9980,6 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 9580: Cover image from Coce, a remote image URL cache)\n"; SetVersion($DBversion); } -$DBversion = "XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do(q| - INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AddressFormat','us','Choose format to display postal addresses',NULL,'Choice') - |); - print "Upgrade to $DBversion done (Bug 4041: Address Format as a I18N/L10N system preference\n"; - SetVersion ($DBversion); -} $DBversion = "3.19.00.020"; if ( CheckVersion($DBversion) ) { @@ -10275,6 +10267,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.19.00.032"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES('AddressFormat','us','Choose format to display postal addresses','','Choice') + |); + print "Upgrade to $DBversion done (Bug 4041: Address Format as a I18N/L10N system preference\n"; + SetVersion ($DBversion); +} + # 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. diff --git a/kohaversion.pl b/kohaversion.pl index 2f845e88b6..cc162ae012 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -17,7 +17,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.19.00.031'; + our $VERSION = '3.19.00.032'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 2.39.5