# HG changeset patch
# User Dan
# Date 1194050445 14400
# Node ID b9a8a993f4e7bc7af1a880fe16b2f6e78a8d9e64
# Parent  e5302cb1945cb52ab422eb2164604c34f73079b0# Parent  6a4573507ff875f148c75da4fd9aadef8fd54108
Merging in fixes from stable

diff -r e5302cb1945c -r b9a8a993f4e7 plugins/SpecialAdmin.php
diff -r e5302cb1945c -r b9a8a993f4e7 plugins/SpecialUserPrefs.php
--- a/plugins/SpecialUserPrefs.php	Fri Nov 02 20:37:26 2007 -0400
+++ b/plugins/SpecialUserPrefs.php	Fri Nov 02 20:40:45 2007 -0400
@@ -212,6 +212,8 @@
           
           if ( strlen($newpass) > 0 )
           {
+            if ( defined('ENANO_DEMO_MODE') )
+              $errors .= '<div class="error-box" style="margin: 0 0 10px 0;">You can\'t change your password in demo mode.</div>';
             // Perform checks
             if ( strlen($newpass) < 6 )
               $errors .= '<div class="error-box" style="margin: 0 0 10px 0;">Password must be at least 6 characters. You hacked my script, darn you!</div>';
diff -r e5302cb1945c -r b9a8a993f4e7 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Fri Nov 02 20:37:26 2007 -0400
+++ b/plugins/admin/UserManager.php	Fri Nov 02 20:40:45 2007 -0400
@@ -52,7 +52,14 @@
     }
     else
     {
-      if ( $session->user_id != $user_id )
+      if ( $session->user_id == $user_id )
+      {
+        $username = $session->username;
+        $password = false;
+        $email = $session->email;
+        $real_name = $session->real_name;
+      }
+      else
       {
         $username = $_POST['username'];
         if ( !preg_match('#^'.$session->valid_username.'$#', $username) )
diff -r e5302cb1945c -r b9a8a993f4e7 upgrade.sql
--- a/upgrade.sql	Fri Nov 02 20:37:26 2007 -0400
+++ b/upgrade.sql	Fri Nov 02 20:40:45 2007 -0400
@@ -97,6 +97,7 @@
 ---END 1.0b4---
 ---BEGIN 1.0b3---
 INSERT INTO {{TABLE_PREFIX}}config(config_name, config_value) VALUES( 'allowed_mime_types', 'cbf:len=168;crc=c3dcad3f;data=0[1],1[4],0[3],1[1],0[2],1[1],0[11],1[1],0[7],1[1],0[9],1[1],0[6],1[3],0[10],1[1],0[2],1[2],0[1],1[1],0[1],1[2],0[6],1[3],0[1],1[1],0[2],1[4],0[1],1[2],0[3],1[1],0[4],1[2],0[26],1[5],0[6],1[2],0[2],1[1],0[4],1[1],0[10],1[2],0[1],1[1],0[6]|end' );
+ALTER TABLE {{TABLE_PREFIX}}privmsgs ADD COLUMN message_read tinyint(1) NOT NULL DEFAULT 0;
 ---END 1.0b3---
 ---BEGIN 1.0b2---
 -- 10/1: Removed alterations to users table, moved to upgrade.php, to allow the session manager to work