From 242555e659d4c03f46bc95a7437456718f1b6706 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 24 May 2013 17:15:51 +0200 Subject: fixed a bug when deleting folders --- db/foldermapper.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'db') diff --git a/db/foldermapper.php b/db/foldermapper.php index c2a44dc20..ceb70f18c 100644 --- a/db/foldermapper.php +++ b/db/foldermapper.php @@ -88,12 +88,15 @@ class FolderMapper extends Mapper implements IMapper { // someone please slap me for doing this manually :P // we needz CASCADE + FKs please - $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?; '. - 'DELETE `items` FROM `*PREFIX*news_items` `items` '. - 'LEFT JOIN `*PREFIX*news_feeds` `feeds` ON '. - '`items`.`feed_id` = `feed`.`id` WHERE `feeds`.`id` IS NULL;'; + $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?'; $params = array($entity->getId()); $this->execute($sql, $params); + + $sql = 'DELETE `items` FROM `*PREFIX*news_items` `items` '. + 'LEFT JOIN `*PREFIX*news_feeds` `feeds` ON '. + '`items`.`feed_id` = `feeds`.`id` WHERE `feeds`.`id` IS NULL'; + + $this->execute($sql); } -- cgit v1.2.3