From a9f618f96daceead440f69e2d41f47ebe5c0bd06 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 11 Dec 2018 20:31:19 +0000 Subject: [PATCH] Bug 21961: DBRev 18.11.00.001 Signed-off-by: Nick Clemens (cherry picked from commit a02b322fe7f6a35c0613a33a2e266bb79a721260) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../mysql/atomicupdate/bug_21961_didyouean_typo.sql | 4 ---- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21961_didyouean_typo.sql diff --git a/Koha.pm b/Koha.pm index be3093fda9..ed29178e39 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 = "18.11.00.000"; +$VERSION = "18.11.00.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21961_didyouean_typo.sql b/installer/data/mysql/atomicupdate/bug_21961_didyouean_typo.sql deleted file mode 100644 index a78f85650a..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21961_didyouean_typo.sql +++ /dev/null @@ -1,4 +0,0 @@ -UPDATE permissions SET code = "manage_didyoumean" WHERE code = "manage_didyouean"; -UPDATE user_permissions SET code = "manage_didyoumean" WHERE code = "manage_didyouean"; - --- Bug 21961 - Fix typo in manage_didyoumean permission diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d0eb565bfd..0fde5c5ee5 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17135,6 +17135,18 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (18.11.00 release)\n"; } +$DBversion = '18.11.00.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE permissions SET code = 'manage_didyoumean' WHERE code = 'manage_didyouean'; + }); + $dbh->do(q{ + UPDATE user_permissions SET code = 'manage_didyoumean' WHERE code = 'manage_didyouean'; + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion (Bug 21961 - Fix typo in manage_didyoumean permission)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5