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

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

Browse source
This commit is contained in:
denise 2012-08-28 16:17:46 -04:00
commit 7ee68c55e0
8 changed files with 95 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/WebstreamController.php
View file

@ -102,7 +102,7 @@ class WebstreamController extends Zend_Controller_Action
$hasPermission = true;
}
if ($user->isHost()) {
if (!$hasPermission && $user->isHost()) {
if ($webstream_id != -1) {
$webstream = CcWebstreamQuery::create()->findPK($webstream_id);
//we are updating a playlist. Ensure that if the user is a host/dj, that he has the correct permission.