From beef2ae1f96f36c0a6fa19073c55b6842ade2845 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Fri, 19 Jun 2015 14:00:13 -0400
Subject: [PATCH] Bug 14427: Use Koha::version instead of
 C4::Context->KOHAVERSION

While testing bug 9006, I discovered this gem in
installer/install.pl

TEST PLAN
---------
 1) back up DB
 2) drop db and create db
 3) git reset --hard origin/3.20.x
 4) run web installer and all sample data
 5) git reset --hard origin/master
 6) empty your koha intranet error log
 7) run web installer to upgrade
    -- there will be warnings regarding regex around
       installer/install.pl line 328 or so.
       grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
 8) repeat steps 2-6
 9) apply this patch
10) run web installer to upgrade
    -- no regex warnings.
       grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
11) koha qa test tools

Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
---
 installer/install.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/install.pl b/installer/install.pl
index 056107e..cc67557 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -326,7 +326,7 @@ elsif ( $step && $step == 3 ) {
         my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
         my $logdir = C4::Context->config('logdir');
         my $dbversion = C4::Context->preference('Version');
-        my $kohaversion = C4::Context->KOHAVERSION;
+        my $kohaversion = Koha::version;
         $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
 
         my $filename_suffix = join '_', $now, $dbversion, $kohaversion;
-- 
2.1.0