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

merge
---
 airtime_mvc/application/models/Playlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index f095a063f..a56bca59e 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -63,7 +63,7 @@ class Application_Model_Playlist {
         $defaultFade = Application_Model_Preference::GetDefaultFade();
         if ($defaultFade !== "") {
             //fade is in format SS.uuuuuu
-            $fade = DateTime::createFromFormat("U.u", $defaultFade, new DateTimeZone("UTC"));
+            $fade = DateTime::createFromFormat("s.u", $defaultFade, new DateTimeZone("UTC"));
             $this->plItem["fadein"] = $fade->format("H:i:s.u");
             $this->plItem["fadeout"] = $fade->format("H:i:s.u");
         }