use a deleted flag for deleted feeds to handle undo

2 files changed, 3 insertions, 0 deletions

diff --git a/external/feedapi.php b/external/feedapi.php
index 7273a5413..9d8f75482 100644
--- a/external/feedapi.php
+++ b/external/feedapi.php
@@ -82,6 +82,8 @@ class FeedAPI extends Controller {
 		$folderId = (int) $this->params('folderId', 0);
 
 		try {
+			$this->feedBusinessLayer->purgeDeleted($userId);
+			
 			$feed = $this->feedBusinessLayer->create($feedUrl, $folderId, $userId);
 			$result = array(
 				'feeds' => array($feed->toAPI())
diff --git a/external/folderapi.php b/external/folderapi.php
index 879d62b5a..314b4ea2f 100644
--- a/external/folderapi.php
+++ b/external/folderapi.php
@@ -72,6 +72,7 @@ class FolderAPI extends Controller {
 		);
 
 		try {
+			$this->folderBusinessLayer->purgeDeleted($userId);
 			$folder = $this->folderBusinessLayer->create($folderName, $userId);
 			array_push($result['folders'], $folder->toAPI());