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_0019.sql | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/sql/incremental/upd_0019.sql b/install/sql/incremental/upd_0019.sql index b09d2d7..60c464c 100644 --- a/install/sql/incremental/upd_0019.sql +++ b/install/sql/incremental/upd_0019.sql @@ -1,4 +1,4 @@ -CREATE TABLE `help_faq` ( +CREATE TABLE IF NOT EXISTS `help_faq` ( `hf_id` int(11) NOT NULL AUTO_INCREMENT, `hf_section` int(11) DEFAULT NULL, `hf_order` int(11) DEFAULT '0', @@ -12,7 +12,7 @@ PRIMARY KEY (`hf_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -CREATE TABLE `help_faq_sections` ( +CREATE TABLE IF NOT EXISTS `help_faq_sections` ( `hfs_id` int(11) NOT NULL AUTO_INCREMENT, `hfs_name` varchar(255) DEFAULT NULL, `hfs_order` int(11) DEFAULT '0', -- Gitblit v1.9.1