Bug 13485: DBRev 3.21.00.018

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

diff --git a/Koha.pm b/Koha.pm
index 413074d..e4a317f 100644 (file)
--- 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 = "3.21.00.017";
+$VERSION = "3.21.00.018";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql b/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql
deleted file mode 100644 (file)
index 64192c7..0000000
--- a/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO systempreferences (variable,value,options,explanation,type)
-VALUES ('RestrictedPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: \"127.0.0,127.0.2\")','Free'),
-('RestrictedPageContent','',NULL,'HTML content of the restricted page','TextArea'),
-('RestrictedPageTitle','',NULL,'Title of the restricted page (breadcrumb and header)','Free')

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e1d547a..10809a1 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10748,6 +10748,19 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.21.00.018";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES
+            ('RestrictedPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: \"127.0.0,127.0.2\")','Free'),
+            ('RestrictedPageContent','',NULL,'HTML content of the restricted page','TextArea'),
+            ('RestrictedPageTitle','',NULL,'Title of the restricted page (breadcrumb and header)','Free')
+    });
+    print "Upgrade to $DBversion done (Bug 13485: Add a page to display links to restricted sites)\n";
+    SetVersion ($DBversion);
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.