Merge branch 'feature/mysql-port' into 'master'

Marius Cramer

2015-05-19 6f6aa983d80882d10038945c10d7dedf572e0641

 server/lib/app.inc.php

@@ -51,7 +51,7 @@
               */

         if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) {
            $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database']);
            $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database'], $conf['dbmaster_port']);
         } else {
            $this->dbmaster = $this->db;
         }