# HG changeset patch
# User Dan
# Date 1205023183 18000
# Node ID ecb6364907025da44dca35463554ae16838b41f6
# Parent  449b042ea6b051c5c6a0409b5d169e93d9340561
Updated upgrade/migration schemas to handle user_timezone column properly

diff -r 449b042ea6b0 -r ecb636490702 install/schemas/upgrade/1.1.1-1.1.2-mysql.sql
--- a/install/schemas/upgrade/1.1.1-1.1.2-mysql.sql	Sat Mar 08 12:22:05 2008 -0500
+++ b/install/schemas/upgrade/1.1.1-1.1.2-mysql.sql	Sat Mar 08 19:39:43 2008 -0500
@@ -5,7 +5,7 @@
 ALTER TABLE {{TABLE_PREFIX}}logs ADD COLUMN is_draft tinyint(1) NOT NULL DEFAULT 0;
 
 ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_rank int(12) UNSIGNED NOT NULL DEFAULT 1;
-@ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_timezone int(12) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_timezone int(12) UNSIGNED NOT NULL DEFAULT 0;
 
 ALTER TABLE {{TABLE_PREFIX}}tags CHANGE user user_id mediumint(8) NOT NULL DEFAULT 1;
 ALTER TABLE {{TABLE_PREFIX}}themes
diff -r 449b042ea6b0 -r ecb636490702 install/schemas/upgrade/migration/1.0-1.1-mysql.sql
--- a/install/schemas/upgrade/migration/1.0-1.1-mysql.sql	Sat Mar 08 12:22:05 2008 -0500
+++ b/install/schemas/upgrade/migration/1.0-1.1-mysql.sql	Sat Mar 08 19:39:43 2008 -0500
@@ -14,7 +14,6 @@
 ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_has_avatar tinyint(1) NOT NULL;
 ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN avatar_type ENUM('jpg', 'png', 'gif') NOT NULL;
 ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_registration_ip varchar(39);
-ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_timezone int(12) NOT NULL DEFAULT 0;
 ALTER TABLE {{TABLE_PREFIX}}comments ADD COLUMN ip_address varchar(39);
 
 CREATE TABLE {{TABLE_PREFIX}}lockout(
diff -r 449b042ea6b0 -r ecb636490702 install/upgrade.php
--- a/install/upgrade.php	Sat Mar 08 12:22:05 2008 -0500
+++ b/install/upgrade.php	Sat Mar 08 19:39:43 2008 -0500
@@ -208,6 +208,7 @@
   
   $site_url = makeUrl(getConfig('main_page'), false, true);
   echo '<p>All done! I\'ll actually be nice enough to give you a <a href="' . $site_url . '">link back to your site</a> this release <tt>:)</tt></p>';
+  echo '<p><b>It is important that you run a language string re-import and then clear your browser cache.</b> Otherwise you may see bits of the interface that appear to not be localized. This process will be automatic and non-destructive in later versions.</p>';
 }
 else
 {