From 6d9bc489a23596b37eca88eec46d2ead030d8e82 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 8 Oct 2019 14:45:03 +0100 Subject: [PATCH] Bug 21701: DBRev 19.06.00.037 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../mysql/atomicupdate/bug_21701_PayPalReturnURL.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21701_PayPalReturnURL.perl diff --git a/Koha.pm b/Koha.pm index 1ffe3d33c5..3c164d5778 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 = "19.06.00.036"; +$VERSION = "19.06.00.037"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21701_PayPalReturnURL.perl b/installer/data/mysql/atomicupdate/bug_21701_PayPalReturnURL.perl deleted file mode 100644 index ca7f88bd92..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21701_PayPalReturnURL.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) - VALUES ('PayPalReturnURL','BaseURL','BaseURL|OPACAlias','Specify whether PayPal will return to the url specified in the OPACBaseURL option or to the OPAC\'s alias url.','Choice') - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21701 - PayPal return URL option)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 53fbea3fc4..16d8baa207 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19631,6 +19631,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 20334: Add elasticsearch escape options preference)\n"; } +$DBversion = '19.06.00.037'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) + VALUES ('PayPalReturnURL','BaseURL','BaseURL|OPACAlias','Specify whether PayPal will return to the url specified in the OPACBaseURL option or to the OPAC\'s alias url.','Choice') + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21701 - PayPal return URL option)\n"; +} + # 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