Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-10 447c8380668b753c95f97ec2b87ff322e4aff002

 install/install.php

@@ -208,7 +208,7 @@
   }

   //* 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']['host'] = $tmp_mysql_server_host;
      $conf['mysql']['port'] = $tmp_mysql_server_port;
      $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -217,7 +217,7 @@
      $conf['mysql']['charset'] = $tmp_mysql_server_charset;
      $finished = true;
   } else {
      swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error());
      swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error());
   }
} while ($finished == false);
unset($finished);
@@ -553,7 +553,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;
@@ -561,7 +561,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);