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.
---
install/sql/incremental/upd_0035.sql | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/sql/incremental/upd_0035.sql b/install/sql/incremental/upd_0035.sql
index aeaf821..5f8031c 100644
--- a/install/sql/incremental/upd_0035.sql
+++ b/install/sql/incremental/upd_0035.sql
@@ -1,4 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
--
-- Table structure for table `sys_theme`
@@ -20,6 +20,6 @@
-- --------------------------------------------------------
ALTER TABLE `web_domain` ADD `ssl_key` MEDIUMTEXT NOT NULL AFTER `ssl_bundle`;
-ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`
+ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`;
--
Gitblit v1.9.1