CC-3174 : showbuilder merges

adjusting format of default fade to not confuse DateTime.
This commit is contained in:
Naomi Aro 2012-02-06 12:48:53 +01:00
parent 9e08f857bf
commit e487b4a444
1 changed files with 4 additions and 2 deletions

View File

@ -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);