diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-04-01 13:16:15 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-04-01 13:16:15 +0200 |
commit | 3620dae1e6b3fab5a4ba4001b4581ce7ed795996 (patch) | |
tree | 775d2fe5b2942d9231888ed01d0a0081a1b2347e /src/Wallabag/CoreBundle/Helper/ContentProxy.php | |
parent | b886ee923d7e627da2ae0221271bedbcb495025a (diff) | |
parent | bfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7 (diff) | |
download | wallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.tar.gz wallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.tar.zst wallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/ContentProxy.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index d38811a2..31953f12 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -256,18 +256,17 @@ class ContentProxy | |||
256 | $entry->setTitle($content['open_graph']['og_title']); | 256 | $entry->setTitle($content['open_graph']['og_title']); |
257 | } | 257 | } |
258 | 258 | ||
259 | $html = $content['html']; | 259 | if (empty($content['html'])) { |
260 | if (false === $html) { | 260 | $content['html'] = $this->fetchingErrorMessage; |
261 | $html = $this->fetchingErrorMessage; | ||
262 | 261 | ||
263 | if (!empty($content['open_graph']['og_description'])) { | 262 | if (!empty($content['open_graph']['og_description'])) { |
264 | $html .= '<p><i>But we found a short description: </i></p>'; | 263 | $content['html'] .= '<p><i>But we found a short description: </i></p>'; |
265 | $html .= $content['open_graph']['og_description']; | 264 | $content['html'] .= $content['open_graph']['og_description']; |
266 | } | 265 | } |
267 | } | 266 | } |
268 | 267 | ||
269 | $entry->setContent($html); | 268 | $entry->setContent($content['html']); |
270 | $entry->setReadingTime(Utils::getReadingTime($html)); | 269 | $entry->setReadingTime(Utils::getReadingTime($content['html'])); |
271 | 270 | ||
272 | if (!empty($content['status'])) { | 271 | if (!empty($content['status'])) { |
273 | $entry->setHttpStatus($content['status']); | 272 | $entry->setHttpStatus($content['status']); |