]> git.mjollnir.org Git - s9y.git/commitdiff
also accept FM/EM
authorgarvinhicking <garvinhicking>
Tue, 24 Jan 2006 12:10:55 +0000 (12:10 +0000)
committergarvinhicking <garvinhicking>
Tue, 24 Jan 2006 12:10:55 +0000 (12:10 +0000)
include/admin/importers/movabletype.inc.php

index 119c275464ca5888efd2ca8846edb03fd910464f..b33c9185c584f8f6ac0f0a256ef2181dc9d1ccea 100644 (file)
@@ -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;
                 }