From 2c35a0416a86fda56ddc1ed35ee12baa6657dd44 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 30 May 2013 16:53:03 -0400 Subject: [PATCH] clrf fix --- airtime_mvc/application/models/Playlist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 23150d266..7011a501f 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -437,10 +437,10 @@ SQL; } $entry["ftype"] = $objType; - $entry["fadein"] = isset($p_item['fadein']) ? + $entry["fadein"] = isset($p_item['fadein']) ? $p_item['fadein'] : $entry["fadein"]; - $entry["fadeout"] = isset($p_item['fadeout']) ? + $entry["fadeout"] = isset($p_item['fadeout']) ? $p_item['fadeout'] : $entry["fadeout"]; }