diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-03-18 09:26:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 09:26:33 +0100 |
| commit | bfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7 (patch) | |
| tree | 4a4bb6ed5e0053b24bf0777321b631f1fb6082f3 /src | |
| parent | 8ab5dcc467268de67f41ac0d008633edf46ae857 (diff) | |
| parent | 8ca858ee7301ea332baa9ad9543bb72d10b5caa2 (diff) | |
| download | wallabag-bfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7.tar.gz wallabag-bfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7.tar.zst wallabag-bfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7.zip | |
Merge pull request #3909 from wallabag/fix/html-not-defined
Fix PHP warning
Diffstat (limited to 'src')
| -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']); |