Fix os.time() conversions for pm times.

This commit is contained in:
James Roseborough
2015-04-28 23:06:40 +00:00
parent 4c3d0f9cdd
commit 08dfdf1434
2 changed files with 2 additions and 1 deletions

View File

@@ -494,7 +494,7 @@ public class OsLib extends TwoArgFunction {
c.set(Calendar.YEAR, table.get("year").checkint());
c.set(Calendar.MONTH, table.get("month").checkint()-1);
c.set(Calendar.DAY_OF_MONTH, table.get("day").checkint());
c.set(Calendar.HOUR, table.get("hour").optint(12));
c.set(Calendar.HOUR_OF_DAY, table.get("hour").optint(12));
c.set(Calendar.MINUTE, table.get("min").optint(0));
c.set(Calendar.SECOND, table.get("sec").optint(0));
c.set(Calendar.MILLISECOND, 0);