# HG changeset patch
# User Dan
# Date 1182609504 14400
# Node ID edfc244087696ea274955586d936580b31d993dd
# Parent  61ad9ffbd69c75f4e4db650cd38054e5c79bbb91
Upgrades (RC2->RC3) should now work

diff -r 61ad9ffbd69c -r edfc24408769 KNOWN_BUGS
diff -r 61ad9ffbd69c -r edfc24408769 includes/sessions.php
--- a/includes/sessions.php	Sat Jun 23 10:18:55 2007 -0400
+++ b/includes/sessions.php	Sat Jun 23 10:38:24 2007 -0400
@@ -873,16 +873,27 @@
     }
     $keyhash = md5($key);
     $salt = $db->escape($keydata[3]);
-    $query = $this->sql('SELECT u.user_id AS uid,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,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,x.* FROM '.table_prefix.'session_keys AS k
-                           LEFT JOIN '.table_prefix.'users AS u
-                             ON ( u.user_id=k.user_id )
-                           LEFT JOIN '.table_prefix.'users_extra AS x
-                             ON ( u.user_id=x.user_id OR x.user_id IS NULL )
-                           LEFT JOIN '.table_prefix.'privmsgs AS p
-                             ON ( p.message_to=u.username AND p.message_read=0 )
-                           WHERE k.session_key=\''.$keyhash.'\'
-                             AND k.salt=\''.$salt.'\'
-                           GROUP BY u.user_id;');
+    $query = $db->sql_query('SELECT u.user_id AS uid,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,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,x.* FROM '.table_prefix.'session_keys AS k
+                               LEFT JOIN '.table_prefix.'users AS u
+                                 ON ( u.user_id=k.user_id )
+                               LEFT JOIN '.table_prefix.'users_extra AS x
+                                 ON ( u.user_id=x.user_id OR x.user_id IS NULL )
+                               LEFT JOIN '.table_prefix.'privmsgs AS p
+                                 ON ( p.message_to=u.username AND p.message_read=0 )
+                               WHERE k.session_key=\''.$keyhash.'\'
+                                 AND k.salt=\''.$salt.'\'
+                               GROUP BY u.user_id;');
+    if ( !$query )
+    {
+      $query = $this->sql('SELECT u.user_id AS uid,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,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms FROM '.table_prefix.'session_keys AS k
+                             LEFT JOIN '.table_prefix.'users AS u
+                               ON ( u.user_id=k.user_id )
+                             LEFT JOIN '.table_prefix.'privmsgs AS p
+                               ON ( p.message_to=u.username AND p.message_read=0 )
+                             WHERE k.session_key=\''.$keyhash.'\'
+                               AND k.salt=\''.$salt.'\'
+                             GROUP BY u.user_id;');
+    }
     if($db->numrows() < 1)
     {
       // echo '(debug) $session->validate_session: Key was not found in database<br />';
diff -r 61ad9ffbd69c -r edfc24408769 upgrade.sql
--- a/upgrade.sql	Sat Jun 23 10:18:55 2007 -0400
+++ b/upgrade.sql	Sat Jun 23 10:38:24 2007 -0400
@@ -3,7 +3,7 @@
 -- ALL NON-SQL LINES, even otherwise blank lines, must start with "--" or they will get sent to MySQL!
 -- Common tasks (version numbers)
 DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version';
-INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0' );
+INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0' ),( 'enano_rc_version', '3' );
 ---BEGIN 1.0RC2---
 -- Add the "Moderators" group
 UPDATE {{TABLE_PREFIX}}groups SET group_id=9999 WHERE group_id=3;