Merge pull request #751 from owncloud/next

Changes for 8.1

1 files changed, 7 insertions, 5 deletions

diff --git a/db/foldermapper.php b/db/foldermapper.php
index bce599b45..867e05493 100644
--- a/db/foldermapper.php
+++ b/db/foldermapper.php
@@ -13,12 +13,12 @@
 
 namespace OCA\News\Db;
 
-use \OCP\IDb;
-use \OCP\AppFramework\Db\Entity;
+use OCP\IDBConnection;
+use OCP\AppFramework\Db\Entity;
 
 class FolderMapper extends NewsMapper {
 
-    public function __construct(IDb $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'news_folders', '\OCA\News\Db\Folder');
     }
 
@@ -58,12 +58,14 @@ class FolderMapper extends NewsMapper {
         // we needz CASCADE + FKs please
         $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?';
         $params = [$entity->getId()];
-        $this->execute($sql, $params);
+        $stmt = $this->execute($sql, $params);
+        $stmt->closeCursor();
 
         $sql = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` NOT IN '.
             '(SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds`)';
 
-        $this->execute($sql);
+        $stmt = $this->execute($sql);
+        $stmt->closeCursor();
     }