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:
Rudi Grinberg 2012-09-11 16:03:01 -04:00
commit e664707076
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ class WebstreamController extends Zend_Controller_Action
//clear the session in case an old playlist was open: CC-4196
Application_Model_Library::changePlaylist(null, null);
$this->view->obj = new Application_Model_Webstream($webstream);
$this->view->obj = new Application_Model_Webstream($webstream->getDbId());
$this->view->action = "new";
$this->view->html = $this->view->render('webstream/webstream.phtml');
}
@ -68,7 +68,7 @@ class WebstreamController extends Zend_Controller_Action
if ($webstream) {
Application_Model_Library::changePlaylist($id, "stream");
}
$this->view->obj = new Application_Model_Webstream($webstream);
$this->view->obj = new Application_Model_Webstream($webstream->getDbId());
$this->view->action = "edit";
$this->view->html = $this->view->render('webstream/webstream.phtml');
}