From db2a7a4a6bb9aa74db0452cfc89fb4b922ffed48 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 30 Apr 2021 07:49:22 +0000 Subject: [PATCH] Bug 28244: DBRev 20.11.05.004 Signed-off-by: Jonathan Druart (cherry picked from commit 36c54d818578e4853254e80d6c59ba7cb3db5bd1) Signed-off-by: Fridolin Somers --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_28244.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_28244.perl diff --git a/Koha.pm b/Koha.pm index d50f8d600f..a55ff2d0f2 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 = "20.11.05.003"; +$VERSION = "20.11.05.004"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_28244.perl b/installer/data/mysql/atomicupdate/bug_28244.perl deleted file mode 100644 index 897a26f2d6..0000000000 --- a/installer/data/mysql/atomicupdate/bug_28244.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "UPDATE language_subtag_registry SET description = 'Ukrainian' WHERE subtag='uk' and type='language' and description='Ukranian'" ); - $dbh->do( "UPDATE language_descriptions SET description = 'Ukrainian' WHERE subtag='uk' and type='language' and lang='en' and description='Ukranian'" ); - - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 28244, "Fix Ukrainian typo in English"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 328c08923e..c382b9e96e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23570,6 +23570,18 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 28258, "Update AUTO_RENEWAL content"); } +$DBversion = '20.11.05.004'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE language_subtag_registry SET description = 'Ukrainian' WHERE subtag='uk' and type='language' and description='Ukranian' + }); + $dbh->do(q{ + UPDATE language_descriptions SET description = 'Ukrainian' WHERE subtag='uk' and type='language' and lang='en' and description='Ukranian' + }); + + NewVersion( $DBversion, 28244, "Fix Ukrainian typo in English"); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.39.5