gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new/bug11196' into 3.14.x

This commit is contained in:
Galen Charlton 2013-11-14 19:07:23 +00:00
parent 3eb3c22470 cf5cfcbe34
commit add41d7ef1
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
installer/data/mysql/sysprefs.sql
View File

@ -328,6 +328,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),
('SearchEngine','Zebra','Solr|Zebra','Search Engine','Choice'),
('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),

8
installer/data/mysql/updatedatabase.pl
View File

@ -7743,6 +7743,14 @@ if(CheckVersion($DBversion)) {
SetVersion($DBversion);
}
$DBversion = "3.13.00.043";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
$dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('SearchEngine','Zebra','Solr|Zebra','Search Engine','Choice')");
print "Upgrade to $DBversion done (Bug 11196: Add system preference SearchEngine if missing )\n";
SetVersion($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

2
kohaversion.pl
View File

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.13.00.042';
our $VERSION = '3.13.00.043';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install