respect articles per update count in item cleanup

1 files changed, 7 insertions, 4 deletions

diff --git a/db/itemmapper.php b/db/itemmapper.php
index 8fa40e8eb..891cb624d 100644
--- a/db/itemmapper.php
+++ b/db/itemmapper.php
@@ -258,10 +258,13 @@ class ItemMapper extends Mapper implements IMapper {
 	 */
 	public function deleteReadOlderThanThreshold($threshold){
 		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
-		$sql = 'SELECT COUNT(*) `size`, `feed_id` ' .
-			'FROM `*PREFIX*news_items` ' .
-			'WHERE NOT ((`status` & ?) > 0) ' .
-			'GROUP BY `feed_id` ' .
+		$sql = 'SELECT COUNT(*) - `feeds`.`articles_per_update` AS `size`, ' .
+		'`items`.`feed_id` AS `feed_id`, ' . 
+			'FROM `*PREFIX*news_items` `items` ' .
+			'JOIN `*PREFIX*news_feeds` `feeds` ' .
+				'ON `feeds`.`id` = `items`.`feed_id` ' .
+			'WHERE NOT ((`items`.`status` & ?) > 0) ' .
+			'GROUP BY `items`.`feed_id` ' .
 			'HAVING COUNT(*) > ?';
 		$params = array($status, $threshold);
 		$result = $this->execute($sql, $params);