Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index 2e611766ce3c3300f395489eed55132047b0e35b..9bc9a41ea92d028cc2e69be2e5531b1f8a0fa3fc 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -122,6 +122,9 @@ function install_connect_db() {
        $db = db_create_db($conn);
        if (!$db) {
                display_error(_("Cannot connect to database. User or password is invalid or you have no permittions to create database."));
+       } else {
+               if (strncmp(db_get_version(), "5.6", 3) >= 0) 
+                       db_query("SET sql_mode = ''");
        }
        return $db;
 }
@@ -292,6 +295,7 @@ elseif(get_post('install_coas'))
                        'pass' => $_POST['pass'],
                        'name' => $_POST['name'],
                        'admin' => $_POST['admin'],
+                       'lang' => $_POST['lang']
                ));
                if (do_install()) {
                        $_POST['Page'] = 6;
@@ -405,4 +409,3 @@ end_form(1);
 
 end_page(false, false, true);
 
-?>