From a1aa87940b754016984947a6650b9672e858e33e Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Fri, 7 Feb 2014 15:49:40 +0100
Subject: [PATCH] fix non-default value of data-field in tasks-table (thx to an
 error-report), set version to 0.9.32-rc1 for upcoming release candidate

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 install/froxlor.sql                            |  4 ++--
 install/updates/froxlor/0.9/update_0.9.inc.php | 11 +++++++++++
 lib/tables.inc.php                             |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index 89d2d6ee..d17bed60 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -528,14 +528,14 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'phpconfigs_hidestdsubdomain', '0'),
 	('panel', 'allow_theme_change_admin', '1'),
 	('panel', 'allow_theme_change_customer', '1'),
-	('panel', 'version', '0.9.32-dev6');
+	('panel', 'version', '0.9.32-rc1');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
 CREATE TABLE `panel_tasks` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `type` int(11) NOT NULL default '0',
-  `data` text NOT NULL,
+  `data` text NOT NULL default '',
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 6f375d33..1d684b03 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2716,3 +2716,14 @@ if (isFroxlorVersion('0.9.32-dev5')) {
 
 	updateToVersion('0.9.32-dev6');
 }
+
+if (isFroxlorVersion('0.9.32-dev6')) {
+
+	showUpdateStep("Updating from 0.9.32-dev6 to 0.9.32-rc1", false);
+
+	showUpdateStep("Enhancing tasks-table");
+	Database::query("ALTER `".TABLE_PANEL_TASKS."` MODIFY `data` text NOT NULL default ''");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.32-rc1');
+}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 6547a80b..e0120774 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
 define('TABLE_DOMAINTOIP', 'panel_domaintoip');
 
 // VERSION INFO
-$version = '0.9.32-dev6';
+$version = '0.9.32-rc1';
 $dbversion = '2';
 $branding = '';