Fixing database upgrade failure from koha.upgrade and setting language
This commit is contained in:
parent
4d5274c4d9
commit
a1a1bfc8fa
|
|
@ -1736,7 +1736,8 @@ Which language do you choose? |;
|
|||
|
||||
sub updatedatabase {
|
||||
# At this point, $etcdir/koha.conf must exist, for C4::Context
|
||||
$ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp';
|
||||
$ENV{"KOHA_CONF"}=$etcdir.'/koha.conf';
|
||||
if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
|
||||
startsysout();
|
||||
my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
|
||||
if ($result) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
use strict; # please develop with the strict pragma
|
||||
use Install;
|
||||
|
||||
$::language='en';
|
||||
setlanguage('en');
|
||||
|
||||
###############################################
|
||||
# SET THE etcdir ENVIRONMENT VAR INSTEAD #
|
||||
|
|
|
|||
Loading…
Reference in New Issue