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_0026.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0026.sql b/install/sql/incremental/upd_0026.sql
index b5787a9..a859ee2 100644
--- a/install/sql/incremental/upd_0026.sql
+++ b/install/sql/incremental/upd_0026.sql
@@ -1 +1 @@
-ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
\ No newline at end of file
+ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
\ No newline at end of file

--
Gitblit v1.9.1