From c78ec70396eca7bff736cf75cf95d97fae3cbd70 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 29 Jun 2020 00:58:06 -0500
Subject: [PATCH] installer fixes

---
 app/Http/Controllers/Install/ChecksController.php | 5 ++++-
 resources/views/install/database.blade.php        | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Install/ChecksController.php b/app/Http/Controllers/Install/ChecksController.php
index efb1cdef48..593aa24a3c 100644
--- a/app/Http/Controllers/Install/ChecksController.php
+++ b/app/Http/Controllers/Install/ChecksController.php
@@ -41,8 +41,11 @@ class ChecksController extends InstallationController implements InstallerStep
             $this->markStepComplete();
         }
 
+        preg_match('/\d+\.\d+\.\d+/', PHP_VERSION, $matches);
+        $version = $matches[0] ?? PHP_VERSION;
+
         return view('install.checks', $this->formatData([
-            'php_version' => PHP_VERSION,
+            'php_version' => $version,
             'php_required' => Php::PHP_MIN_VERSION,
             'php_ok' => $this->checkPhpVersion(),
             'modules' => $this->moduleResults(),
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php
index dadbe1ddfd..d7a6fc03b9 100644
--- a/resources/views/install/database.blade.php
+++ b/resources/views/install/database.blade.php
@@ -142,7 +142,7 @@
             $('#migrate-warning').show()
             $('#migrate-status>i').attr('class', 'fa fa-lg fa-spinner fa-spin');
             $('#error-box').empty();
-            $('#migrate-btn').addClass('disabled')
+            $('#migrate-btn').prop('disabled', true).addClass('disabled')
 
             var output = document.getElementById("db-update");
             var xhr = new XMLHttpRequest();
@@ -156,13 +156,12 @@
                     // if error word in output, show the retry button
                     $('#migrate-warning').hide();
                     $('#migrate-status>i').attr('class', 'fa fa-lg fa-times-rectangle-o text-danger')
-                    $('#migrate-btn').removeClass('disabled').text('@lang('install.migrate.retry')')
+                    $('#migrate-btn').prop('disabled', false).removeClass('disabled').text('@lang('install.migrate.retry')')
                     $('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.error')</div>'));
                 }
             };
             xhr.timeout = 240000; // if no response for 4m, allow the user to retry
             xhr.ontimeout = function (e) {
-                $("#retry-btn").css("display", "");
                 $('#migrate-warning').hide();
                 $('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.timeout')</div>'));
             };