Merged revisions 2916-2941 from stable branch.

tbrehm

2012-02-22 dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137

 server/lib/app.inc.php

@@ -49,7 +49,7 @@
               if we are in a multiserver setup
               */
               
               if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
               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']);
               } else {
                  $this->dbmaster = $this->db;