From c71e95b775f94ac39a0b83c7cdbd15c4f545f557 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 12 Apr 2012 04:39:40 -0400
Subject: [PATCH] - Fix adding contact form fields in situation when the fieldset is empty.   Fixes issue with lost manager/assistant fields in LDAP addressbook

---
 SQL/mysql.update.sql |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index 8d7802a..300ceb5 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -219,9 +219,11 @@
 
 -- Updates from version 0.7
 
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
 ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
 ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
-ALTER TABLE `contacts` MODIFY `email` text NOT NULL DEFAULT '';
+ALTER TABLE `contacts` MODIFY `email` text NOT NULL;
 ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
 ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
@@ -235,3 +237,5 @@
 ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
 ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
 ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;

--
Gitblit v1.9.1