Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 install/update.php

@@ -229,7 +229,7 @@
   if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
      $finished = true;
   } else {
      swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
      swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
      $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
   }
} while ($finished == false);
@@ -255,7 +255,7 @@
      $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

      //* Initialize the MySQL server connection
      if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
      if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
         $conf['mysql']['master_host'] = $tmp_mysql_server_host;
         $conf['mysql']['master_port'] = $tmp_mysql_server_port;
         $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -263,7 +263,7 @@
         $conf['mysql']['master_database'] = $tmp_mysql_server_database;
         $finished = true;
      } else {
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
      }
   } while ($finished == false);
   unset($finished);