# HG changeset patch
# User Dan
# Date 1229861241 18000
# Node ID f37b60d393bc8b9a92fc55f1f2c70041f35f7bb8
# Parent  20370871c333ad28c3d923adfe3a3db9134c6f5d
Fixed a couple PostgreSQL bugs.

diff -r 20370871c333 -r f37b60d393bc includes/sessions.php
--- a/includes/sessions.php	Sun Dec 21 06:34:43 2008 -0500
+++ b/includes/sessions.php	Sun Dec 21 07:07:21 2008 -0500
@@ -1055,7 +1055,7 @@
                              . '    ON ( p.message_to=u.username AND p.message_read=0 )' . "\n"
                              . '  WHERE k.session_key=\''.$keyhash.'\'' . "\n"
                              . '    AND k.salt=\''.$salt.'\'' . "\n"
-                             . '  GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,u.user_lang,u.user_timezone,u.user_title,k.source_ip,k.time,k.auth_level,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public, x.disable_js_fx;');
+                             . '  GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,u.user_lang,u.user_timezone,u.user_title,u.user_dst,k.source_ip,k.time,k.auth_level,k.key_type,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public, x.disable_js_fx;');
     
     if ( !$query && ( defined('IN_ENANO_INSTALL') or defined('IN_ENANO_UPGRADE') ) )
     {
@@ -2370,7 +2370,7 @@
          . "      )\n"
          . "  LEFT JOIN " . table_prefix . "ranks AS rd\n"
          . "    ON ( rd.rank_id = 1 )$append\n"
-         . "  GROUP BY u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, g.group_rank,\n"
+         . "  GROUP BY u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, u.user_rank_userset, g.group_rank,\n"
          . "       ru.rank_id, ru.rank_title, ru.rank_style,rg.rank_id, rg.rank_title, rg.rank_style,\n"
          . "       rl.rank_id, rl.rank_title, rl.rank_style,rd.rank_id, rd.rank_title, rd.rank_style;";
     
diff -r 20370871c333 -r f37b60d393bc install/schemas/postgresql_stage2.sql
--- a/install/schemas/postgresql_stage2.sql	Sun Dec 21 06:34:43 2008 -0500
+++ b/install/schemas/postgresql_stage2.sql	Sun Dec 21 07:07:21 2008 -0500
@@ -397,7 +397,7 @@
 INSERT INTO {{TABLE_PREFIX}}users_extra(user_id) VALUES
   (2);
   
-INSERT INTO {{TABLE_PREFIX}}ranks(rank_title, rank_style) VALUES
+INSERT INTO {{TABLE_PREFIX}}ranks(rank_id, rank_title, rank_style) VALUES
   (1, 'user_rank_member', ''),
   (2, 'user_rank_mod', 'font-weight: bold; color: #00AA00;'),
   (3, 'user_rank_admin', 'font-weight: bold; color: #AA0000;'),