diff options
| author | Alessandro Cosentino <cosenal@gmail.com> | 2012-10-19 14:14:49 -0400 |
|---|---|---|
| committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-10-19 14:14:49 -0400 |
| commit | f17574c2b053e7fb0fb81f76a05ef3b8d21efa78 (patch) | |
| tree | d7ff3fda18694a4893d34d9eed1ac0832e93c075 | |
| parent | 53fd10a2323eb7a906cb277facff3ae68fbc941a (diff) | |
index accepts feedid as parameter; fix to make the search provider work and to have nice urls anyway
| -rw-r--r-- | appinfo/info.xml | 4 | ||||
| -rw-r--r-- | controllers/news.controller.php | 9 | ||||
| -rw-r--r-- | lib/search.php | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/appinfo/info.xml b/appinfo/info.xml index b88f2451c..ab9034442 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,5 +6,7 @@ <licence>AGPL</licence> <shipped>true</shipped> <author>Alessandro Cosentino</author> - <require>4</require> + <require>4.9</require> + <shipped>true</shipped> + <default_enable/> </info> diff --git a/controllers/news.controller.php b/controllers/news.controller.php index 814f90d10..be3cdbf08 100644 --- a/controllers/news.controller.php +++ b/controllers/news.controller.php @@ -50,10 +50,11 @@ class NewsController extends Controller { $feedMapper = new FeedMapper($this->userId); $itemMapper = new ItemMapper($this->userId); - // always show the last viewed feed on reload - $lastViewedFeedId = (int)$this->getUserValue('lastViewedFeed'); - $lastViewedFeedType = (int)$this->getUserValue('lastViewedFeedType'); - $showAll = $this->getUserValue('showAll'); + // if no feed id is passed as parameter, then show the last viewed feed on reload + $lastViewedFeedId = isset( $_GET['feedid'] ) ? $_GET['feedid'] : (int)$this->getUserValue('lastViewedFeed'); + $lastViewedFeedType = isset( $_GET['feedid'] ) ? FeedType::FEED : (int)$this->getUserValue('lastViewedFeedType'); + + $showAll = $this->getUserValue('showAll'); if( $lastViewedFeedId === null || $lastViewedFeedType === null) { $lastViewedFeedId = $feedMapper->mostRecent(); diff --git a/lib/search.php b/lib/search.php index d9d5d89f3..a5378fa56 100644 --- a/lib/search.php +++ b/lib/search.php @@ -17,7 +17,7 @@ class OC_Search_Provider_News extends OC_Search_Provider{ foreach($allFeeds as $feed) { if(substr_count(strtolower($feed['title']), strtolower($query)) > 0) { - $link = OCP\Util::linkTo('news', 'index.php').'&lastViewedFeedId='.urlencode($feed['id']); + $link = OCP\Util::linkTo('news', 'index.php').'&feedid='.urlencode($feed['id']); $results[]=new OC_Search_Result($feed['title'], '', $link, (string)$l->t('News')); } } |