From 320235bfecba6fdb9551cab9943de4e058541c49 Mon Sep 17 00:00:00 2001
From: Len Kranendonk <len@webgui-svn>
Date: Wed, 24 Aug 2005 22:28:19 +0000
Subject: [PATCH] Fixed [ 1266285 ] 6.7.1 - UserProfile Fields Time error

---
 docs/changelog/6.x.x.txt             | 4 ++++
 docs/upgrades/upgrade_6.7.1-6.7.2.pl | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 19b842869..b090da596 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,6 +2,9 @@
  - fix [ 1268605 ] field type selection broken (midellaq)
  - fix [ 1267548 ] can't add metadata field (midellaq) 
  - fix [ 1265788 ] SyndicatedContent *not working* in 6.7.x
+ - fix [ 1266285 ] 6.7.1 - UserProfile Fields Time error (Len Kranendonk)
+
+=======
  - fix [ 1245765 ] Missing 'page not found' crashes settings 
  - fix [ 1263934 ] 6.6.5 Import Scripts Asset URLs
  - fix [ 1260760 ] Default endDate in asset table too high for FreeBSD
@@ -16,6 +19,7 @@
  - fix [ 1248040 ] plainblack forum search not showing dates
  - fix [ 1265771 ] assets that were formerly packages are still on packageList
  - fix [ 1177447 ] deployPackage does not retain content pos. (mwilson)
+>>>>>>> 1.450
 
 6.7.1
  - fix [ 1251608 ] can't login
diff --git a/docs/upgrades/upgrade_6.7.1-6.7.2.pl b/docs/upgrades/upgrade_6.7.1-6.7.2.pl
index 06aba22eb..fb96501df 100644
--- a/docs/upgrades/upgrade_6.7.1-6.7.2.pl
+++ b/docs/upgrades/upgrade_6.7.1-6.7.2.pl
@@ -21,6 +21,8 @@ WebGUI::Session::open("../..",$configFile);
 WebGUI::Session::refreshUserInfo(3);
 
 WebGUI::SQL->write("insert into webguiVersion values (".quote($toVersion).",'upgrade',".time().")");
+WebGUI::SQL->write("update DataForm_field set type=".quote('TimeField')." where type=".quote('time'));
+WebGUI::SQL->write("update userProfileField set dataType=".quote('TimeField')." where dataType=".quote('time'));
 fixSpelling();
 fixCSTemplate();