From 8beb039f0b7d23b03f7963c3a56c8dde65af3b6b Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 30 Apr 2016 03:32:35 -0400
Subject: [PATCH] allow underscore in ALIAS name (Fixes: #3866)
---
install/tpl/config.inc.php.master | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 0737c13..2ba18f3 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.1b1');
define('DEVSYSTEM', 0);
@@ -83,7 +83,7 @@
//** Database settings for the master DB. This setting is only used in multiserver setups
$conf['dbmaster_type'] = 'mysql';
$conf['dbmaster_host'] = '{mysql_master_server_host}';
-$conf['dbmaster_host'] = '{mysql_master_server_port}';
+$conf['dbmaster_port'] = '{mysql_master_server_port}';
$conf['dbmaster_database'] = '{mysql_master_server_database}';
$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';
--
Gitblit v1.9.1