From f412878b64da7c780ba641c4491150ccc52d2f57 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 7 May 2021 12:38:35 +0000
Subject: [PATCH] Bug 23215: DBRev 20.12.00.047

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 Koha.pm                                        |  2 +-
 .../data/mysql/atomicupdate/bug_23215.perl     | 17 -----------------
 installer/data/mysql/updatedatabase.pl         | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_23215.perl

diff --git a/Koha.pm b/Koha.pm
index e15d45800a..0b6eff4c8b 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.12.00.046";
+$VERSION = "20.12.00.047";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_23215.perl b/installer/data/mysql/atomicupdate/bug_23215.perl
deleted file mode 100644
index 4808bd07d4..0000000000
--- a/installer/data/mysql/atomicupdate/bug_23215.perl
+++ /dev/null
@@ -1,17 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    $dbh->do(q{
-        DELETE FROM systempreferences
-        WHERE variable IN
-            ('EnablePayPalOpacPayments',
-             'PayPalChargeDescription',
-             'PayPalPwd',
-             'PayPalReturnURL',
-             'PayPalSandboxMode',
-             'PayPalSignature',
-             'PayPalUser');
-    });
-
-    NewVersion( $DBversion, 23215, "Remove core PayPal support in favor of the use of plugins");
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index b15b2d947b..c584806144 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -24209,6 +24209,24 @@ if( CheckVersion( $DBversion ) ) {
     NewVersion( $DBversion, 14723, "Additional delivery notes to messages" );
 }
 
+$DBversion = '20.12.00.047';
+if( CheckVersion( $DBversion ) ) {
+
+    $dbh->do(q{
+        DELETE FROM systempreferences
+        WHERE variable IN
+            ('EnablePayPalOpacPayments',
+             'PayPalChargeDescription',
+             'PayPalPwd',
+             'PayPalReturnURL',
+             'PayPalSandboxMode',
+             'PayPalSignature',
+             'PayPalUser');
+    });
+
+    NewVersion( $DBversion, 23215, "Remove core PayPal support in favor of the use of plugins" );
+}
+
 # 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/';