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-09-14 16:38:33 -04:00
commit ee98c8fba5
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,9 +90,9 @@ class LibraryController extends Zend_Controller_Action
protected function playlistNotFound($p_type)
{
$this->view->error = "{$p_type} not found";
$this->view->error = "$p_type not found";
Logging::info("{$p_type} not found");
Logging::info("$p_type not found");
Application_Model_Library::changePlaylist(null, $p_type);
$this->createFullResponse(null);
}

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

@ -109,7 +109,7 @@ class UserController extends Zend_Controller_Action
# TODO : remove this. we only use default for now not to break the UI.
if (!$files_action) { # set default action
$files_action = "reassign_to";
$valid_actions =
$delId = 1;
}
# only delete when valid action is selected for the owned files

8
airtime_mvc/application/models/Webstream.php
View file

@ -78,11 +78,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
$username = $subjs->getDbLogin();
return array(
"name" => $this->webstream->getDbName(),
"length" => $this->webstream->getDbLength(),
"name" => $this->webstream->getDbName(),
"length" => $this->webstream->getDbLength(),
"description" => $this->webstream->getDbDescription(),
"login"=> $username,
"url" => $this->webstream->getDbUrl(),
"login" => $username,
"url" => $this->webstream->getDbUrl(),
);
}