From 1deebedf11e673623c7ba663aba8fa62dfa57a77 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 3 Feb 2012 18:28:35 +0100
Subject: [PATCH] CC-3174 : showbuilder
throwing an exception if playlist doesn't exist.
---
airtime_mvc/application/models/Playlist.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index a5b69a81a..e6f4bb2b2 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -54,6 +54,10 @@ class Application_Model_Playlist {
{
if (isset($id)) {
$this->pl = CcPlaylistQuery::create()->findPK($id);
+
+ if (is_null($this->_pl)){
+ throw new Exception();
+ }
}
else {
$this->pl = new CcPlaylist();
@@ -206,7 +210,7 @@ class Application_Model_Playlist {
$contentsToUpdate = CcPlaylistcontentsQuery::create()
->filterByDbPlaylistId($this->id)
->orderByDbPosition()
- ->find();
+ ->find($this->con);
$pos = $afterItem->getDbPosition() + 1;
}
@@ -279,12 +283,12 @@ class Application_Model_Playlist {
CcPlaylistcontentsQuery::create()
->findPKs($p_items)
- ->delete();
+ ->delete($this->con);
$contents = CcPlaylistcontentsQuery::create()
->filterByDbPlaylistId($this->id)
->orderByDbPosition()
- ->find();
+ ->find($this->con);
//reset the positions of the remaining items.
for ($i = 0; $i < count($contents); $i++) {