From 62f3fd6a8f935e61af9199d175ece23baad40878 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 11 Aug 2015 15:09:54 -0300 Subject: [PATCH] Bug 13485: DBRev 3.21.00.018 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- .../atomicupdate/Bug13485_RestrictedSitesPage.sql | 4 ---- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql diff --git a/Koha.pm b/Koha.pm index 413074d11c..e4a317f9dc 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 = "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 index 64192c782f..0000000000 --- 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 e1d547a86d..10809a16b2 100755 --- 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. -- 2.39.5