From: garvinhicking Date: Mon, 12 Dec 2005 08:48:53 +0000 (+0000) Subject: . X-Git-Tag: 1.0~236 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0c25bbe444eeaa60f7f038fbf79a24ef3f8e8f46;p=s9y.git . --- diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php index 698d6df..5572bfe 100644 --- a/include/admin/importers/movabletype.inc.php +++ b/include/admin/importers/movabletype.inc.php @@ -393,6 +393,15 @@ class Serendipity_Import_MovableType extends Serendipity_Import { $entry['authorid'] = $serendipity['authorid']; $entry['author'] = $serendipity['realname']; } + + if (!isset($entry['isdraft'])) { + $entry['isdraft'] = 'false'; + } + + if (!isset($entry['allow_comments'])) { + $entry['allow_comments'] = 'true'; + } + $comments = $entry['s9y_comments']; $entryprops = $entry['props']; unset($entry['props']); diff --git a/include/functions.inc.php b/include/functions.inc.php index a432a6b..89feac3 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -398,7 +398,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL $headers[] = 'Message-ID: <'. md5(microtime() . uniqid(time())) .'@'. $_SERVER['HTTP_HOST'] .'>'; $headers[] = 'MIME-Version: 1.0'; $headers[] = 'Precedence: bulk'; - $headers[] = 'Content-Type: text/plain; charset="' . LANG_CHARSET .'"'; + $headers[] = 'Content-Type: text/plain; charset=' . LANG_CHARSET; return mail($to, $subject, $message, implode("\n", $headers)); }