Bug 10550: Merge 2 updatedatabase entries into 1

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 19fe04c..1aad839 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7081,13 +7081,10 @@ if ( CheckVersion($DBversion) ) {
         UPDATE saved_sql SET savedsql = REPLACE(savedsql, 'wthdrawn', 'withdrawn')
     });
 
-    print "Upgrade to $DBversion done (Bug 10550 - Fix database typo wthdrawn)\n";
-    SetVersion($DBversion);
-}
+    $dbh->do(q{
+        UPDATE marc_subfield_structure SET kohafield = 'items.withdrawn' WHERE kohafield = 'items.wthdrawn'
+    });
 
-$DBversion = "3.13.00.XXX";
-if ( CheckVersion($DBversion) ) {
-    $dbh->do("UPDATE marc_subfield_structure SET kohafield = 'items.withdrawn' WHERE kohafield = 'items.wthdrawn'");
     print "Upgrade to $DBversion done (Bug 10550 - Fix database typo wthdrawn)\n";
     SetVersion($DBversion);
 }