From 76cfe7714bda0c9872f270b7a3f76542129336ac Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 31 Mar 2011 19:10:18 -0400 Subject: [PATCH] -Fix timestamp calculation problem for the UI --- application/models/Shows.php | 4 ---- plugins/jquery.showinfo.js | 2 +- public/js/playlist/helperfunctions.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/application/models/Shows.php b/application/models/Shows.php index f98a3bf20..e19e62182 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -973,10 +973,6 @@ class Show_DAL { { global $CC_CONFIG, $CC_DBC; - $timestamp = explode(" ", $timeNow); - $date = $timestamp[0]; - $time = $timestamp[1]; - $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record" ." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s" ." WHERE si.show_id = s.id" diff --git a/plugins/jquery.showinfo.js b/plugins/jquery.showinfo.js index bda16ce29..c6eba4959 100644 --- a/plugins/jquery.showinfo.js +++ b/plugins/jquery.showinfo.js @@ -375,5 +375,5 @@ function convertDateToPosixTime(s){ } else sec = time[2]; - return Date.UTC(year, month, day, hour, minute, sec, msec); + return Date.UTC(year, month-1, day, hour, minute, sec, msec); } diff --git a/public/js/playlist/helperfunctions.js b/public/js/playlist/helperfunctions.js index a9a57467c..cdd2eb931 100644 --- a/public/js/playlist/helperfunctions.js +++ b/public/js/playlist/helperfunctions.js @@ -134,7 +134,7 @@ function convertDateToPosixTime(s){ } else sec = time[2]; - return Date.UTC(year, month, day, hour, minute, sec, msec); + return Date.UTC(year, month-1, day, hour, minute, sec, msec); } function getFileExt(filename){