diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2016-12-18 12:40:27 +0100 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2016-12-18 12:40:27 +0100 |
| commit | 8147ff76a49206a08999f420206d971de10db12e (patch) | |
| tree | dea3412c8e30cfab464557bcbe4c5c3fb08bc33e /application/FeedBuilder.php | |
| parent | 9eba6ff469bdea8f341af06ef23c8bb4bd3a6869 (diff) | |
| parent | e3ffc8fdee30be41046b985fe6e7034fb580b0c8 (diff) | |
| download | Shaarli-8147ff76a49206a08999f420206d971de10db12e.tar.gz Shaarli-8147ff76a49206a08999f420206d971de10db12e.tar.zst Shaarli-8147ff76a49206a08999f420206d971de10db12e.zip | |
merge
Diffstat (limited to 'application/FeedBuilder.php')
| -rw-r--r-- | application/FeedBuilder.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index 4036a7cc..b0aa5764 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php | |||
| @@ -156,12 +156,12 @@ class FeedBuilder | |||
| 156 | $link['description'] = format_description($link['description'], '', $pageaddr); | 156 | $link['description'] = format_description($link['description'], '', $pageaddr); |
| 157 | $link['description'] .= PHP_EOL .'<br>— '. $permalink; | 157 | $link['description'] .= PHP_EOL .'<br>— '. $permalink; |
| 158 | 158 | ||
| 159 | $pubDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); | 159 | $pubDate = $link['created']; |
| 160 | $link['pub_iso_date'] = $this->getIsoDate($pubDate); | 160 | $link['pub_iso_date'] = $this->getIsoDate($pubDate); |
| 161 | 161 | ||
| 162 | // atom:entry elements MUST contain exactly one atom:updated element. | 162 | // atom:entry elements MUST contain exactly one atom:updated element. |
| 163 | if (!empty($link['updated'])) { | 163 | if (!empty($link['updated'])) { |
| 164 | $upDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['updated']); | 164 | $upDate = $link['updated']; |
| 165 | $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM); | 165 | $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM); |
| 166 | } else { | 166 | } else { |
| 167 | $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);; | 167 | $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);; |