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

This commit is contained in:
denise 2012-08-16 18:17:54 -04:00
commit 1e1398739f
10 changed files with 111 additions and 23 deletions

View file

@ -199,7 +199,13 @@ class Application_Model_Webstream{
{
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$webstream = new CcWebstream();
$id = $parameters['id'];
if ($id != -1) {
$webstream = CcWebstreamQuery::create()->findPK($id);
} else {
$webstream = new CcWebstream();
}
$webstream->setDbName($parameters["name"]);
$webstream->setDbDescription($parameters["description"]);
$webstream->setDbUrl($parameters["url"]);
@ -214,5 +220,7 @@ class Application_Model_Webstream{
$webstream->setDbMime($mime);
$webstream->save();
return $webstream->getDbId();
}
}