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-08-22 16:09:14 -04:00
commit a3b6d0259c
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Library.php
View file

@ -13,6 +13,8 @@ class Application_Model_Library
$info['className'] = 'Application_Model_Block';
} else if (strcmp($p_type, 'stream')==0) {
$info['className'] = 'Application_Model_Webstream';
} else {
throw new Exception("Unknown object type: '$p_type'");
}
return $info;
@ -21,7 +23,6 @@ class Application_Model_Library
public static function changePlaylist($p_id, $p_type)
{
$obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
Logging::info($obj_sess);
if (is_null($p_id) || is_null($p_type)) {
unset($obj_sess->id);