CC-3174 : showbuilder merges
adjusting format of default fade to not confuse DateTime.
This commit is contained in:
parent
9e08f857bf
commit
e487b4a444
|
@ -62,8 +62,10 @@ class Application_Model_Playlist {
|
||||||
|
|
||||||
$defaultFade = Application_Model_Preference::GetDefaultFade();
|
$defaultFade = Application_Model_Preference::GetDefaultFade();
|
||||||
if ($defaultFade !== "") {
|
if ($defaultFade !== "") {
|
||||||
$this->plItem["fadein"] = $defaultFade;
|
//fade is in format SS.uuuuuu
|
||||||
$this->plItem["fadeout"] = $defaultFade;
|
$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);
|
$this->con = isset($con) ? $con : Propel::getConnection(CcPlaylistPeer::DATABASE_NAME);
|
||||||
|
|
Loading…
Reference in New Issue