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

fix indentation and remove \r characters

This commit is contained in:
Martin Konecny 2012-08-20 18:29:57 -04:00
parent 4d8dc01638
commit d517bf6e19
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -275,7 +275,6 @@ class PlaylistController extends Zend_Controller_Action
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);
try { try {
Logging::log("Currently active {$type} {$this->obj_sess->id}"); Logging::log("Currently active {$type} {$this->obj_sess->id}");
if (in_array($this->obj_sess->id, $ids)) { if (in_array($this->obj_sess->id, $ids)) {
Logging::log("Deleting currently active {$type}"); Logging::log("Deleting currently active {$type}");
@ -290,11 +289,9 @@ class PlaylistController extends Zend_Controller_Action
Application_Model_Block::deleteBlocks($ids, $userInfo->id); Application_Model_Block::deleteBlocks($ids, $userInfo->id);
} }
$this->createFullResponse($obj); $this->createFullResponse($obj);
} } catch (PlaylistNoPermissionException $e) {
catch (PlaylistNoPermissionException $e) {
$this->playlistNoPermission($type); $this->playlistNoPermission($type);
} } catch (PlaylistNotFoundException $e) {
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($type); $this->playlistNotFound($type);
} catch (Exception $e) { } catch (Exception $e) {
$this->playlistUnknownError($e); $this->playlistUnknownError($e);