From e06aaac5120f95212598b54cd1fb6e2513e77b86 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 13 Sep 2014 12:46:29 +0200 Subject: fix starred count for deleted folders, reload path when deleting --- db/itemmapper.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'db') diff --git a/db/itemmapper.php b/db/itemmapper.php index 18684af82..88eaa8e1d 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -75,16 +75,17 @@ class ItemMapper extends Mapper implements IMapper { public function starredCount($userId){ - $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_feeds` `feeds` ' . - 'JOIN `*PREFIX*news_items` `items` ' . - 'ON `items`.`feed_id` = `feeds`.`id` ' . + $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_items` `items` '. + 'JOIN `*PREFIX*news_feeds` `feeds` ' . + 'ON `feeds`.`id` = `items`.`feed_id` '. + 'AND `feeds`.`deleted_at` = 0 ' . 'AND `feeds`.`user_id` = ? ' . - // WARNING: this is a desperate attempt at making this query work - // because prepared statements don't work. This is a possible - // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. - // think twice when changing this - 'WHERE ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' . - StatusFlag::STARRED . ')'; + 'AND ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' . + StatusFlag::STARRED . ')' . + 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' . + 'ON `folders`.`id` = `feeds`.`folder_id` ' . + 'WHERE `feeds`.`folder_id` = 0 ' . + 'OR `folders`.`deleted_at` = 0'; $params = [$userId]; -- cgit v1.2.3