From 9b2e4d966684d509ac64b4d83835c1d6d8992dd2 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 28 Aug 2015 10:36:11 -0300 Subject: [PATCH] Bug 11584: DBRev 3.21.00.21 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- ...584-add_UseWYSIWYGinSystemPreferences_syspref.sql | 1 - installer/data/mysql/updatedatabase.pl | 12 +++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_11584-add_UseWYSIWYGinSystemPreferences_syspref.sql diff --git a/Koha.pm b/Koha.pm index ada0f06bee..d507d1f740 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.020"; +$VERSION = "3.21.00.021"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_11584-add_UseWYSIWYGinSystemPreferences_syspref.sql b/installer/data/mysql/atomicupdate/bug_11584-add_UseWYSIWYGinSystemPreferences_syspref.sql deleted file mode 100644 index 08eed5eba7..0000000000 --- a/installer/data/mysql/atomicupdate/bug_11584-add_UseWYSIWYGinSystemPreferences_syspref.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 582fae6388..6e99abbea8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10779,13 +10779,23 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.21.00.020"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) + INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('FeeOnChangePatronCategory','1','','If set, when a patron changes to a category with enrolment fee, a fee is charged','YesNo') }); print "Upgrade to $DBversion done (Bug 13697: Option to don't charge a fee, if the patron changes to a category with enrolment fee)\n"; SetVersion($DBversion); } +$DBversion = "3.21.00.021"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo') + }); + print "Upgrade to $DBversion done (Bug 11584: Add wysiwyg editor to system preferences dealing with HTML)\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.20.1