Merge pull request #1644 from laf/install-fix

Fixed web installer + made the mysql import message stronger
This commit is contained in:
Daniel Preussker
2015-08-07 16:21:14 +00:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
// MYSQL Check - FIXME // MYSQL Check - FIXME
// 1 UNKNOWN // 1 UNKNOWN
require 'config.php'; include 'config.php';
if (!isset($sql_file)) { if (!isset($sql_file)) {
$sql_file = 'build.sql'; $sql_file = 'build.sql';
+2 -2
View File
@@ -301,7 +301,7 @@ elseif($stage == "2") {
<div class="col-md-3"> <div class="col-md-3">
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h5 class="text-center">Importing MySQL DB</h5> <h5 class="text-center">Importing MySQL DB - Do not close this page or interupt the import</h5>
<?php <?php
// Ok now let's set the db connection up // Ok now let's set the db connection up
$config['db_host']=$dbhost; $config['db_host']=$dbhost;
@@ -309,7 +309,7 @@ elseif($stage == "2") {
$config['db_pass']=$dbpass; $config['db_pass']=$dbpass;
$config['db_name']=$dbname; $config['db_name']=$dbname;
$sql_file = '../build.sql'; $sql_file = '../build.sql';
require('../build-base.php'); require '../build-base.php';
?> ?>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">