diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-30 20:46:41 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-30 20:46:41 +0200 |
| commit | 185dba88c1da23f3fa4e787635e42fd81002b2cc (patch) | |
| tree | 8122644648450a7722b617a0d106bca4d1106d95 /p/api/greader.php | |
| parent | ca58a265e6a702e42e25f5bf2393896b5517b0be (diff) | |
| parent | 00e00849815f35ab3e3a1da2cbfa515f4bace392 (diff) | |
Merge 1.1.1-dev into /beta
https://github.com/FreshRSS/FreshRSS/issues/845
Diffstat (limited to 'p/api/greader.php')
| -rw-r--r-- | p/api/greader.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/p/api/greader.php b/p/api/greader.php index ab1a02244..5a23af006 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -371,7 +371,7 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex } $entryDAO = FreshRSS_Factory::createEntryDao(); - $entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, '', $start_time); + $entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, new FreshRSS_Search(''), $start_time); $items = array(); foreach ($entries as $entry) { @@ -465,8 +465,11 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude } $entryDAO = FreshRSS_Factory::createEntryDao(); - $ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', '', $start_time); + $ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', new FreshRSS_Search(''), $start_time); + if (empty($ids)) { //For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632 + $ids[] = 0; + } $itemRefs = array(); foreach ($ids as $id) { $itemRefs[] = array( |