From 65b41af94d904d7d62b242407d68843e3fea802e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 21 May 2015 19:42:03 +0200 Subject: [PATCH 1/2] Google Reader API: work-around for News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632 https://github.com/FreshRSS/FreshRSS/issues/443 --- p/api/greader.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/p/api/greader.php b/p/api/greader.php index 4554a3f9c..5a23af006 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -467,6 +467,9 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude $entryDAO = FreshRSS_Factory::createEntryDao(); $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( From 0d32f694dd63b27bd8b46a6c3b5dec10a42b0e24 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 31 May 2015 20:48:18 +0200 Subject: [PATCH 2/2] Minor comment 1.1.1 https://github.com/FreshRSS/FreshRSS/issues/845 --- app/Models/EntryDAO.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index f939a0fb3..e5acc4a76 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $hasTransaction = false; try { $stm = null; - if ($name === 'lastSeen') { //v1.2 + if ($name === 'lastSeen') { //v1.1.1 if (!$this->bd->inTransaction()) { $this->bd->beginTransaction(); $hasTransaction = true; @@ -29,7 +29,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { if ($hasTransaction) { $this->bd->rollBack(); } - } elseif ($name === 'hash') { //v1.2 + } elseif ($name === 'hash') { //v1.1.1 $stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)'); return $stm && $stm->execute(); }