From f6967ac5759f0cdeb176f578df671373636fb952 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Mon, 17 Sep 2012 11:03:36 -0400
Subject: [PATCH 1/2] Added Martin's fix

---
 airtime_mvc/application/controllers/UsersettingsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php
index d1b1b7031..11689bc76 100644
--- a/airtime_mvc/application/controllers/UsersettingsController.php
+++ b/airtime_mvc/application/controllers/UsersettingsController.php
@@ -23,7 +23,7 @@ class UsersettingsController extends Zend_Controller_Action
         $request = $this->getRequest();
         $settings = $request->getParam("settings");
 
-        Application_Model_Preference::setNowPlayingScreenSettings($data);
+        Application_Model_Preference::setNowPlayingScreenSettings($settings);
     }
 
     public function getNowPlayingScreenSettingsAction()

From d4443da626131b1e646b36478833bcab25f34dbd Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Mon, 17 Sep 2012 11:12:52 -0400
Subject: [PATCH 2/2] Removed debugging statement

---
 airtime_mvc/public/js/airtime/library/library.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index ed3bd13c3..0ae1494fd 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -335,7 +335,6 @@ var AIRTIME = (function(AIRTIME) {
     };
     
     libraryInit = function() {
-        return;
         
         $libContent = $("#library_content");