Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

3 files changed, 16 insertions, 0 deletions

diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index 24581bad0..ad34720a2 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -519,6 +519,16 @@ create table group_alias (
 );
 create index group_alias_group_id_idx on group_alias (group_id);
 
+create table session (
+
+    id varchar(32) primary key /* comment 'session ID'*/,
+    session_data text /* comment 'session data'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/ 
+);
+
+create index session_modified_idx on session (modified);
+
 
 /* Textsearch stuff */
 
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index a4003b6b2..3ef4d0638 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -317,6 +317,9 @@ class MailerDaemon
         } else if ($parsed->ctype_primary == 'text'
             && $parsed->ctype_secondary=='plain') {
             $msg = $parsed->body;
+            if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){
+                $msg = utf8_encode($msg);
+            }
         }else if(!empty($parsed->body)){
             if(common_config('attachments', 'uploads')){
                 //only save attachments if uploads are enabled
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index eca240faa..edc49478f 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -35,3 +35,6 @@ width:20%;
 width:50%;
 margin-left:30px;
 }
+.notice-options a {
+width:16px;
+}
\ No newline at end of file