Polish deleteAll functions. It's not necessary to use sql joins

1 files changed, 4 insertions, 19 deletions

diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php
index a0ea611e9..7c38557f6 100644
--- a/ajax/deletefolder.php
+++ b/ajax/deletefolder.php
@@ -15,31 +15,16 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('news');
 OCP\JSON::callCheck();
 
-function printError() {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing folder.'))));
-	OCP\Util::writeLog('news','ajax/deletefolder.php: Error removing folder: '.$_POST['folderid'], OCP\Util::ERROR);
-	exit();
-}
-
 $userid = OCP\USER::getUser();
 
 $folderid = trim($_POST['folderid']);
 
 $foldermapper = new OC_News_FolderMapper();
 
-$folder = $foldermapper->find($folderid);
-$popfolder = $foldermapper->populate($folder);
-
-// delete child folder
-$children = $popfolder->getChildren();
-foreach ($children as $child) {
-	if ($child instanceOf OC_News_Folder) {
-		if(!$foldermapper->deleteById($child->getId()))
-			printError();
-	}
+if(!$foldermapper->deleteById($folderid)) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing folder.'))));
+	OCP\Util::writeLog('news','ajax/deletefolder.php: Error removing folder: '.$_POST['folderid'], OCP\Util::ERROR);
+	exit();
 }
 
-if(!$foldermapper->deleteById($folderid))
-	printError();
-
 OCP\JSON::success(array('data' => array( 'folderid' => $folderid )));