From 62fd54745e8ea8f61907be57dc4b23b8f3732bc2 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 23 Nov 2004 16:02:32 +0000
Subject: [PATCH] fix suggested by Slef

---
 misc/Install.pm   |  2 +-
 misc/koha.upgrade | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/misc/Install.pm b/misc/Install.pm
index 31f06c162c..738a261ae6 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -283,7 +283,7 @@ Press <ENTER> to exit the installer: |;
 
 #'
 sub releasecandidatewarning {
-    my $message=getmessage('ReleaseCandidateWarning', [$::newversion, $::newversion]);
+    my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
     my $answer=showmessage($message, 'yn', 'n');
 
     if ($answer =~ /y/i) {
diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index 80b2fec9a8..e7b3e257e5 100644
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -14,15 +14,16 @@ Install::setetcdir($ENV{etcdir}||'/etc');
 my $input;
 loadconfigfile();
 
-($::kohaversion = Install::getkohaversion() ) || ($::kohaversion='unknown version');
-$::newversion=`cat koha.version`;
-chomp $::newversion;
-if ($::newversion =~ /RC/) {
-	releasecandidatewarning();
+my $kohaversion=`cat koha.version`;
+chomp $kohaversion;
+Install::setkohaversion $kohaversion;
+
+
+if ($kohaversion =~ /RC/) {
+    releasecandidatewarning();
 }
 
-#FIXME: need kohaversion number
-my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
+my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
 
 unless ($answer =~/y/i) {
 	showmessage(getmessage('AbortingInstall'),'none');
-- 
2.39.5