diff options
Diffstat (limited to 'ajax')
-rw-r--r-- | ajax/deletefolder.php | 10 | ||||
-rw-r--r-- | ajax/importopml.php | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php index 20017c5c0..b50e5fb07 100644 --- a/ajax/deletefolder.php +++ b/ajax/deletefolder.php @@ -29,13 +29,5 @@ if(!$foldermapper->deleteById($folderid)) { exit(); } -// lets check if the currently shown feed is among the deleted feeds -if ($shownfeedid != null) { - $feedmapper = new OCA\News\FeedMapper(); - if (!$feedmapper->findById($shownfeedid)) { - $tmpl = new OCP\Template("news", "part.items.deleted"); - $part_items = $tmpl->fetchPage(); - } -} -OCP\JSON::success(array('data' => array( 'folderid' => $folderid, 'part_items' => $part_items ))); +OCP\JSON::success(array('data' => array( 'folderid' => $folderid ))); diff --git a/ajax/importopml.php b/ajax/importopml.php index b21939b29..80196d176 100644 --- a/ajax/importopml.php +++ b/ajax/importopml.php @@ -50,7 +50,7 @@ function importFeed($feedurl, $folderid) { $l = OC_L10N::get('news'); if ($feedid === null) { - $feed = OCA\News\Utils::fetch($feedurl); + $feed = OCA\News\Utils::slimFetch($feedurl); if ($feed !== null) { $feedid = $feedmapper->save($feed, $folderid); |