From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.

---
 interface/lib/config.inc.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index a27ee16..7fcbfe2 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -44,7 +44,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.3');
+define('ISPC_APP_VERSION', '3.0.5.4p1');
 define('DEVSYSTEM', 0);
 
 
@@ -139,6 +139,7 @@
 //** Default Language
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
+$conf['language_file_import_enabled'] = true; // Bool value: true / false
 
 //** Default Country
 $conf['country'] = 'DE';

--
Gitblit v1.9.1