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

Merge branch '2.3.x' into 2.3.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/models/User.php
This commit is contained in:
Martin Konecny 2013-01-30 18:31:45 -05:00
commit 0a198ae424
20 changed files with 184 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -238,7 +238,8 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]);
Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]);
$md = array('schedule' => Application_Model_Schedule::getSchedule());
Application_Model_RabbitMq::PushSchedule();
Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md);
//Application_Model_RabbitMq::PushSchedule();
}
Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);