wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2009-07-29 11:49:01 -04:00
commit 2b834d04d9
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/laconica_pg.sql
View File

@ -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 */

3
scripts/maildaemon.php
View File

@ -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

3
theme/base/css/ie6.css
View File

@ -35,3 +35,6 @@ width:20%;
width:50%;
margin-left:30px;
}
.notice-options a {
width:16px;
}