From 6d98cca9c3cdd39f1739d8a1abfddfe91afb0ac9 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 10 Jul 2012 16:41:30 -0400
Subject: [PATCH] SAAS-270: Apache2 errors on SaaS

-no reason to pass $pl since it is not even used. Fixed
---
 .../controllers/PlaylistController.php        | 20 +++++++++----------
 airtime_mvc/application/models/Playlist.php   | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index f53a99754..3d0df47ec 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();
     }
@@ -228,7 +228,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();
@@ -251,7 +251,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();
@@ -273,7 +273,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();
@@ -302,7 +302,7 @@ class PlaylistController extends Zend_Controller_Action
             }
         }
         catch (PlaylistOutDatedException $e) {
-            $this->playlistOutdated($pl, $e);
+            $this->playlistOutdated($e);
         }
         catch (PlaylistNotFoundException $e) {
             $this->playlistNotFound();
@@ -331,7 +331,7 @@ class PlaylistController extends Zend_Controller_Action
             }
         }
         catch (PlaylistOutDatedException $e) {
-            $this->playlistOutdated($pl, $e);
+            $this->playlistOutdated($e);
         }
         catch (PlaylistNotFoundException $e) {
             $this->playlistNotFound();
@@ -352,7 +352,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();
@@ -378,7 +378,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();
@@ -399,7 +399,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();
@@ -420,7 +420,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 70710f567..66c0d85ef 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);
 	}
 
     /**