From 2462e4f14452fa1f8dd7c697d339b409a00c7549 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Tue, 30 Apr 2013 15:34:20 -0400
Subject: [PATCH] CC-2301 : CRLF fix.

---
 airtime_mvc/application/models/Block.php | 50 ++++++++++++------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 83a22947e..c99ed22c3 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -670,27 +670,27 @@ SQL;
         return array($fadeIn, $fadeOut);
     }
     
-    /*
-     * create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
-    *
-    * $fadeOut length of fade out in seconds if $id1
-    * $fadeIn length of fade in in seconds of $id2
-    * $offset time in seconds from end of $id1 that $id2 will begin to play.
-    */
-    public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
-    {
-    	$this->con->beginTransaction();
-    	 
-    	try {
-    		$this->changeFadeInfo($id1, null, $fadeOut);
-    		$this->changeFadeInfo($id2, $fadeIn, null, $offset);
-    
-    		$this->con->commit();
-    
-    	} catch (Exception $e) {
-    		$this->con->rollback();
-    		throw $e;
-    	}
+    /*
+     * create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
+    *
+    * $fadeOut length of fade out in seconds if $id1
+    * $fadeIn length of fade in in seconds of $id2
+    * $offset time in seconds from end of $id1 that $id2 will begin to play.
+    */
+    public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
+    {
+    	$this->con->beginTransaction();
+    	 
+    	try {
+    		$this->changeFadeInfo($id1, null, $fadeOut);
+    		$this->changeFadeInfo($id2, $fadeIn, null, $offset);
+    
+    		$this->con->commit();
+    
+    	} catch (Exception $e) {
+    		$this->con->rollback();
+    		throw $e;
+    	}
     }
 
     /**
@@ -738,10 +738,10 @@ SQL;
                 }
                 $row->setDbFadein($fadeIn);
                 
-                if (!is_null($offset)) {
-                	$row->setDbTrackOffset($offset);
-                	Logging::info("Setting offset {$offset} on item {$id}");
-                	$row->save($this->con);
+                if (!is_null($offset)) {
+                	$row->setDbTrackOffset($offset);
+                	Logging::info("Setting offset {$offset} on item {$id}");
+                	$row->save($this->con);
                 }
                 
             }