# HG changeset patch
# User Ziv Scully <ziv@mit.edu>
# Date 1415675271 18000
# Node ID 98b87d905601a2016c82a6ebaf807490984f801c
# Parent  70ec9bb337bebb50df67665eda28d4e23c64aeac# Parent  d77b0665ba7cde57cbc57acad1369805011fd967
Merge.

diff -r 70ec9bb337be -r 98b87d905601 src/c/urweb.c
--- a/src/c/urweb.c	Mon Nov 10 22:04:40 2014 -0500
+++ b/src/c/urweb.c	Mon Nov 10 22:07:51 2014 -0500
@@ -2910,13 +2910,17 @@
     }
   }
   else {
-    if (strptime(s, TIME_FMT_PG, &stm) == end) {
+    if (strptime(s, ctx->app->time_format, &stm) == end) {
       uw_Basis_time *r = uw_malloc(ctx, sizeof(uw_Basis_time));
       r->seconds = mktime(&stm);
       r->microseconds = 0;
       return r;
-    }
-    else if (strptime(s, TIME_FMT, &stm) == end) {
+    } else if (strptime(s, TIME_FMT_PG, &stm) == end) {
+      uw_Basis_time *r = uw_malloc(ctx, sizeof(uw_Basis_time));
+      r->seconds = mktime(&stm);
+      r->microseconds = 0;
+      return r;
+    } else if (strptime(s, TIME_FMT, &stm) == end) {
       uw_Basis_time *r = uw_malloc(ctx, sizeof(uw_Basis_time));
       r->seconds = mktime(&stm);
       r->microseconds = 0;
@@ -3060,7 +3064,10 @@
     }
   }
   else {
-    if (strptime(s, TIME_FMT_PG, &stm) == end) {
+    if (strptime(s, ctx->app->time_format, &stm) == end) {
+      uw_Basis_time r = { mktime(&stm) };
+      return r;
+    } else if (strptime(s, TIME_FMT_PG, &stm) == end) {
       uw_Basis_time r = { mktime(&stm) };
       return r;
     } else if (strptime(s, TIME_FMT, &stm) == end) {
diff -r 70ec9bb337be -r 98b87d905601 tests/timeRoundTrip.ur
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/timeRoundTrip.ur	Mon Nov 10 22:07:51 2014 -0500
@@ -0,0 +1,3 @@
+fun main () : transaction page =
+    t <- now;
+    return <xml>{[readError (show t) : time]}</xml>