From 8b4652fca8185189bf966199807fb0dcdfeb16a7 Mon Sep 17 00:00:00 2001
From: Manish Verma <manish.verma@ladybirdweb.com>
Date: Tue, 6 Dec 2016 12:54:43 +0530
Subject: [PATCH 1/2] bug-fix-patch

Solved issue #180 for current database check which works for mysql.
---
 .../themes/default1/installer/helpdesk/view4.blade.php   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/views/themes/default1/installer/helpdesk/view4.blade.php b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
index e3b081777..b65897bbd 100644
--- a/resources/views/themes/default1/installer/helpdesk/view4.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
@@ -64,6 +64,15 @@ if (DB_HOST && DB_USER && DB_NAME) {
                 if (version_compare($mysqli_version, '5') >= 0) {
                     $results[] = new TestResult('MySQL version is ' . $mysqli_version, STATUS_OK);
                     // $have_inno = check_have_inno($connection);
+                    $sql = "SHOW TABLES FROM ".DB_NAME;
+                    $res = mysqli_query($connection, $sql);
+                    if (!$res) {
+                        $results[] = new TestResult('Database is empty');
+                        $mysqli_ok = true;
+                    } else {
+                        $results[] = new TestResult('Faveo installation requires an empty database, your database already has tables and data in it.', STATUS_ERROR);
+                        $mysqli_ok = false;
+                    }
                 } else {
                     $results[] = new TestResult('Your MySQL version is ' . $mysqli_version . '. We recommend upgrading to at least MySQL5!', STATUS_ERROR);
                     $mysqli_ok = false;

From f4ccb0cd88a4485ef7ba561cc30bbd201258aac7 Mon Sep 17 00:00:00 2001
From: Manish Verma <manish.verma@ladybirdweb.com>
Date: Tue, 6 Dec 2016 15:06:03 +0530
Subject: [PATCH 2/2] bug-fix-2

---
 .../views/themes/default1/installer/helpdesk/view4.blade.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/themes/default1/installer/helpdesk/view4.blade.php b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
index b65897bbd..4f446dcd2 100644
--- a/resources/views/themes/default1/installer/helpdesk/view4.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
@@ -66,7 +66,7 @@ if (DB_HOST && DB_USER && DB_NAME) {
                     // $have_inno = check_have_inno($connection);
                     $sql = "SHOW TABLES FROM ".DB_NAME;
                     $res = mysqli_query($connection, $sql);
-                    if (!$res) {
+                    if (mysqli_fetch_array($res) === null) {
                         $results[] = new TestResult('Database is empty');
                         $mysqli_ok = true;
                     } else {
@@ -214,6 +214,7 @@ $(document).ready(function () {
 
 
             <div  style="border-bottom: 1px solid #eee;">
+                @if(Cache::has('step4')) <?php Cache::forget('step4')?> @endif
                 <p class="setup-actions step">
                     <input type="submit" id="submitme" class="button-danger button button-large button-next" style="background-color: #d43f3a;color:#fff;" value="continue" disabled>
                     <a href="{{URL::route('configuration')}}" class="button button-large button-next" style="float: left;">Previous</a>