diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-12 21:30:42 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-12 21:30:42 -0400 |
commit | be10a14e5877221041acd66a9da08e4514c8f8d1 (patch) | |
tree | eff8ecca550cd0b4f69f57536beee2e167282e3d /ajax/loadfeed.php | |
parent | 90fb216e7dd61c9571d225aa7c5c834c654d9cef (diff) | |
parent | 6c327bd5f8cdbebf45c6aa87f2d54f3dd26663a2 (diff) |
Merge commit 'refs/merge-requests/12' of git://gitorious.org/owncloud/apps into merge-requests/12
Diffstat (limited to 'ajax/loadfeed.php')
-rw-r--r-- | ajax/loadfeed.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ajax/loadfeed.php b/ajax/loadfeed.php index 992e65019..020f7a706 100644 --- a/ajax/loadfeed.php +++ b/ajax/loadfeed.php @@ -17,19 +17,19 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); -$feedid = trim($_POST['feedid']); +$feedId = trim($_POST['feedId']); $l = OC_L10N::get('news'); -$tmpl_items = new OCP\Template("news", "part.items"); -$tmpl_items->assign('feedid', $feedid); -$part_items = $tmpl_items->fetchPage(); +$itemsTpl = new OCP\Template("news", "part.items"); +$itemsTpl->assign('feedid', $feedId); +$feedItems = $itemsTpl->fetchPage(); -$tmpl_items_header = new OCP\Template("news", "part.items.header"); -$tmpl_items_header->assign('feedid', $feedid); -$items_header = $tmpl_items_header->fetchPage(); +$feedMapper = new OCA\News\FeedMapper(); +$feed = $feedMapper->findById($feedId); +$feedTitle = $feed->getTitle(); OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed loaded!'), - 'items_header' => $items_header, - 'part_items' => $part_items ))); + 'feedTitle' => $feedTitle, + 'feedItems' => $feedItems ))); |