From 19ec6e85b46d394b2a3cce3e24eb2d787b1753d9 Mon Sep 17 00:00:00 2001
From: Daniel Kristjansson <danielk@cuymedia.net>
Date: Sat, 20 Aug 2011 18:02:02 -0400
Subject: [PATCH] Fix some instances where ISODate was being used for DB
 insterts.

mysql 5.5 and later reject ISO 8601 combined date and time format when used for DATETIME inserts.
---
 mythtv/libs/libmythtv/tvbrowsehelper.cpp  | 8 ++++----
 mythtv/programs/mythfrontend/proglist.cpp | 2 +-
 mythtv/programs/mythshutdown/main.cpp     | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mythtv/libs/libmythtv/tvbrowsehelper.cpp b/mythtv/libs/libmythtv/tvbrowsehelper.cpp
index 0a839d71537..5c525118afd 100644
--- a/mythtv/libs/libmythtv/tvbrowsehelper.cpp
+++ b/mythtv/libs/libmythtv/tvbrowsehelper.cpp
@@ -365,10 +365,10 @@ void TVBrowseHelper::GetNextProgramDB(
 
     MSqlBindings bindings;
     bindings[":CHANID"] = chanid;
-    bindings[":NOWTS"] = nowtime.toString(Qt::ISODate);
-    bindings[":LATESTTS"] = latesttime.toString(Qt::ISODate);
-    bindings[":BROWSETS"] = browsetime.toString(Qt::ISODate);
-    bindings[":BROWSETS2"] = browsetime.toString(Qt::ISODate);
+    bindings[":NOWTS"] = nowtime;
+    bindings[":LATESTTS"] = latesttime;
+    bindings[":BROWSETS"] = browsetime;
+    bindings[":BROWSETS2"] = browsetime;
 
     QString querystr = " WHERE program.chanid = :CHANID ";
     switch (direction)
diff --git a/mythtv/programs/mythfrontend/proglist.cpp b/mythtv/programs/mythfrontend/proglist.cpp
index 173bcc58bf7..31b11dddec9 100644
--- a/mythtv/programs/mythfrontend/proglist.cpp
+++ b/mythtv/programs/mythfrontend/proglist.cpp
@@ -690,7 +690,7 @@ void ProgLister::DeleteOldEpisode(bool ok)
         "WHERE chanid    = :CHANID AND "
         "      starttime = :STARTTIME");
     query.bindValue(":CHANID",    pi->GetChanID());
-    query.bindValue(":STARTTIME", pi->GetScheduledStartTime(MythDate::ISODate));
+    query.bindValue(":STARTTIME", pi->GetScheduledStartTime());
 
     if (!query.exec())
         MythDB::DBError("ProgLister::DeleteOldEpisode", query);
diff --git a/mythtv/programs/mythshutdown/main.cpp b/mythtv/programs/mythshutdown/main.cpp
index 521fe6687bd..9eb3a345b1f 100644
--- a/mythtv/programs/mythshutdown/main.cpp
+++ b/mythtv/programs/mythshutdown/main.cpp
@@ -7,6 +7,7 @@ using namespace std;
 #include <QCoreApplication>
 #include <QFile>
 
+#include "util.h"
 #include "exitcodes.h"
 #include "mythcontext.h"
 #include "mythdb.h"
@@ -395,7 +396,7 @@ static int setWakeupTime(QString sWakeupTime)
     }
 
     setGlobalSetting("MythShutdownNextScheduled",
-                     dtWakeupTime.toString(Qt::ISODate));
+                     MythDate::toString(dtWakeupTime, MythDate::kDatabase));
 
     return 0;
 }
@@ -602,7 +603,7 @@ static int shutdown()
 
     // save the next wakuptime in the db
     setGlobalSetting("MythShutdownWakeupTime",
-                     dtWakeupTime.toString(Qt::ISODate));
+                     MythDate::toString(dtWakeupTime, MythDate::kDatabase));
 
     // stop here to debug
     //return 0;