From: garvinhicking <garvinhicking>
Date: Tue, 24 Jan 2006 12:10:55 +0000 (+0000)
Subject: also accept FM/EM
X-Git-Tag: 1.0~151
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=51d938156dc0aad5e9ac7dd37572c79f32ea3a08;p=s9y.git

also accept FM/EM
---

diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php
index 119c275..b33c918 100644
--- a/include/admin/importers/movabletype.inc.php
+++ b/include/admin/importers/movabletype.inc.php
@@ -96,8 +96,8 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
         $this->debug('Calling strtotime(' . $string . ') = ' . $ts);
         if ($ts <= 1) {
             // Match strings like: "11/16/2005 00:14:53 PM"
-            if (preg_match('@([01][0-9])/([0-3][0-9])/([0-9]{4}) ([0-2][0-9]):([0-5][0-9]):([0-5][0-9]) (P|A)M@i', $string, $match)) {
-                if ($match[7] == 'P') {
+            if (preg_match('@([01][0-9])/([0-3][0-9])/([0-9]{4}) ([0-2][0-9]):([0-5][0-9]):([0-5][0-9]) (P|A|F|E)M@i', $string, $match)) {
+                if ($match[7] == 'P' || $match[7] == 'E') {
                     // Post mediam, add 12 hours.
                     $match[4] = $match[4] + 12;
                 }