cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #334 from ladybirdweb/manish-bug-fixes-and-updates

Browse Source 
Manish bug fixes and updates
This commit is contained in:
Manish Verma
2016-12-06 15:08:21 +05:30
committed by GitHub
parent 34b1b8454e f4ccb0cd88
commit c439a07425
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/themes/default1/installer/helpdesk/view4.blade.php
View File

@@ -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 (mysqli_fetch_array($res) === null) {
$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;
@@ -205,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>