From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Wed, 29 Apr 2015 14:30:34 +0000 (-0300)
Subject: Bug 4041: DBRev 3.19.00.032
X-Git-Tag: v3.20.00-beta~128
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=8e4c7a3f3b0aab1ad2fd4c75008ceab23dcbc639;p=koha_ffzg

Bug 4041: DBRev 3.19.00.032

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---

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