summaryrefslogtreecommitdiffstats
path: root/appinfo/routes.php
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2013-03-08 14:50:10 +0100
committerAlessandro Cosentino <cosenal@gmail.com>2013-03-08 14:50:10 +0100
commitf652daa3d92d0a5401b45e8b77cc2cfbb42023bd (patch)
tree4eb216c91e2828de9c3e2e9a19c5ed8a91e0cdc6 /appinfo/routes.php
parent25a766a00933ccbe5c24dc4c91bc93587e033abc (diff)
fix merge conflict
Diffstat (limited to 'appinfo/routes.php')
-rw-r--r--appinfo/routes.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 095e03f83..767e59f09 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -234,6 +234,14 @@ $this->create('news_ajax_importOPML', '/import')->action(
},
'news', \OC_API::USER_AUTH
);
+\OCP\API::register(
+ 'post', '/news/feeds/{feedid}/delete',
+ function($urlParams) {
+ $container = createDIContainer();
+ return $container['FeedApi']->delete($urlParams);
+ },
+ 'news', \OC_API::USER_AUTH
+);
/**
* Folder API
@@ -255,6 +263,7 @@ $this->create('news_ajax_importOPML', '/import')->action(
},
'news', \OC_API::USER_AUTH
);
+
\OCP\API::register(
'get', '/news/folders/{folderid}/delete',
function($urlParams) {
@@ -270,4 +279,4 @@ $this->create('news_ajax_importOPML', '/import')->action(
return $container['FolderApi']->modify($urlParams);
},
'news', \OC_API::USER_AUTH
-); \ No newline at end of file
+);