diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-07-24 08:55:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-07-24 08:55:17 +0200 |
| commit | da685f9390b8bfa1193c9d335d36f3648c17fe7e (patch) | |
| tree | db743fc3605d72c6b5146f75cee478777a5e9686 | |
| parent | e4f2784313753bca86487be03d487d5a1523927e (diff) | |
| parent | d0d0861e024efcedd388cb02cbada01d9eb984d5 (diff) | |
Merge pull request #1603 from Alkarex/EasyRSS-PSQL-timestamp
Fix timestamp format with PostgreSQL for EasyRSS
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | p/api/greader.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aad47721a..22c11be1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Korean [#1578](https://github.com/FreshRSS/FreshRSS/pull/1578) * Bug fixing * PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584), [#1594](https://github.com/FreshRSS/FreshRSS/pull/1594) + * Fix API compatibility bug between PostgreSQL and EasyRSS [#1603](https://github.com/FreshRSS/FreshRSS/pull/1603) * Misc. * Allow longer database usernames [#1597](https://github.com/FreshRSS/FreshRSS/issues/1597) diff --git a/p/api/greader.php b/p/api/greader.php index 6b9ea4526..7f6f0b04f 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -503,7 +503,7 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex $item = array( 'id' => /*'tag:google.com,2005:reader/item/' .*/ dec2hex($entry->id()), //64-bit hexa http://code.google.com/p/google-reader-api/wiki/ItemId 'crawlTimeMsec' => substr($entry->id(), 0, -3), - 'timestampUsec' => $entry->id(), //EasyRSS + 'timestampUsec' => '' . $entry->id(), //EasyRSS 'published' => $entry->date(true), 'title' => $entry->title(), 'summary' => array('content' => $entry->content()), |