diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 74c1500b7..d9662a9c6 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -83,7 +83,7 @@ class PlaylistController extends Zend_Controller_Action } } - private function playlistOutdated($pl, $e) + private function playlistOutdated($e) { $this->view->error = $e->getMessage(); } @@ -244,7 +244,7 @@ class PlaylistController extends Zend_Controller_Action $this->createUpdateResponse($pl); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -267,7 +267,7 @@ class PlaylistController extends Zend_Controller_Action $this->createUpdateResponse($pl); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -289,7 +289,7 @@ class PlaylistController extends Zend_Controller_Action $this->createUpdateResponse($pl); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -318,7 +318,7 @@ class PlaylistController extends Zend_Controller_Action } } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -347,7 +347,7 @@ class PlaylistController extends Zend_Controller_Action } } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -368,7 +368,7 @@ class PlaylistController extends Zend_Controller_Action $this->view->fadeOut = $fades[1]; } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -394,7 +394,7 @@ class PlaylistController extends Zend_Controller_Action $this->view->modified = $pl->getLastModified("U"); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -415,7 +415,7 @@ class PlaylistController extends Zend_Controller_Action $this->view->modified = $pl->getLastModified("U"); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); @@ -436,7 +436,7 @@ class PlaylistController extends Zend_Controller_Action $this->view->modified = $pl->getLastModified("U"); } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($pl, $e); + $this->playlistOutdated($e); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound(); diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index c50e41269..9945aa430 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -461,11 +461,13 @@ class Application_Model_Playlist { ->filterByDbPlaylistId($this->id) ->filterByDbPosition($pos) ->findOne(); + + - #Propel returns values in form 00.000000 format which is for only seconds. - $fadeIn = $row->getDbFadein(); - $fadeOut = $row->getDbFadeout(); - return array($fadeIn, $fadeOut); + #Propel returns values in form 00.000000 format which is for only seconds. + $fadeIn = $row->getDbFadein(); + $fadeOut = $row->getDbFadeout(); + return array($fadeIn, $fadeOut); } /**