Install partial fix

1.10.x
Julio Montoya 10 years ago
parent a91a2fa35f
commit 640ce956a1
  1. 1
      main/install/index.php
  2. 8
      main/install/install.lib.php
  3. 1
      main/install/install_db.inc.php

@ -833,6 +833,7 @@ if (@$_POST['step2']) {
include 'install_db.inc.php';
include 'install_files.inc.php';
}
display_after_install_message($installType);
//Hide the "please wait" message sent previously

@ -714,11 +714,15 @@ function load_main_database($installation_settings, $dbScript = '')
}
}
//replace symbolic parameters with user-specified values
foreach ($installation_settings as $key => $value) {
$sql_text = str_replace($key, Database::escape_string($value), $sql_text);
}
parse_sql_queries($sql_text);
global $manager;
$manager->getConnection()->prepare($sql_text);
//parse_sql_queries($sql_text);
}
/**
@ -740,7 +744,6 @@ function load_database_script($dbScript)
*/
function parse_sql_queries($sql_text)
{
//split in array of sql strings
$sql_instructions = array();
split_sql_file($sql_instructions, $sql_text);
@ -749,6 +752,7 @@ function parse_sql_queries($sql_text)
$count = count($sql_instructions);
for ($i = 0; $i < $count; $i++) {
$this_sql_query = $sql_instructions[$i]['query'];
Database::query($this_sql_query);
//UTF8 fix see #5678
/*

@ -80,6 +80,7 @@ if (!defined('CLI_INSTALLATION')) {
$create_database = false;
}
// Create database
if ($create_database) {
$manager->getConnection()->getSchemaManager()->createDatabase($mysqlMainDb);

Loading…
Cancel
Save