From e487b4a444af2c1cb529fb27f84a82c47d2d79c6 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 6 Feb 2012 12:48:53 +0100
Subject: [PATCH] CC-3174 : showbuilder merges

adjusting format of default fade to not confuse DateTime.
---
 airtime_mvc/application/models/Playlist.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 57595ecd3..f095a063f 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -62,8 +62,10 @@ class Application_Model_Playlist {
 
         $defaultFade = Application_Model_Preference::GetDefaultFade();
         if ($defaultFade !== "") {
-            $this->plItem["fadein"] = $defaultFade;
-            $this->plItem["fadeout"] = $defaultFade;
+            //fade is in format SS.uuuuuu
+            $fade = DateTime::createFromFormat("U.u", $defaultFade, new DateTimeZone("UTC"));
+            $this->plItem["fadein"] = $fade->format("H:i:s.u");
+            $this->plItem["fadeout"] = $fade->format("H:i:s.u");
         }
 
         $this->con = isset($con) ? $con : Propel::getConnection(CcPlaylistPeer::DATABASE_NAME);