Fixing database upgrade failure from koha.upgrade and setting language

diff --git a/misc/Install.pm b/misc/Install.pm
index 3ab5070..5c19a57 100644 (file)
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -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) {

diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index 8e915da..16560e3 100644 (file)
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -4,7 +4,7 @@
 use strict; # please develop with the strict pragma
 use Install;
 
-$::language='en';
+setlanguage('en');
 
 ###############################################
 # SET  THE  etcdir  ENVIRONMENT  VAR  INSTEAD #