Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-09-17 11:13:44 -04:00
parent 7fed5bcd18 d4443da626
commit ab99e64e8a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/UsersettingsController.php
View File

@ -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()

1
airtime_mvc/public/js/airtime/library/library.js
View File

@ -335,7 +335,6 @@ var AIRTIME = (function(AIRTIME) {
};
libraryInit = function() {
return;
$libContent = $("#library_content");