diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 16:18:26 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 16:18:26 +0200 |
| commit | 799bb6e0de68f5dddde53a6ea7178a518d16cbfa (patch) | |
| tree | b8b7b63edae7b9f7553a5df15f2c53c002b26fb5 /app/Models/Feed.php | |
| parent | 6dfbc28042c6e18da9c7578ed626064a4d8c7cb3 (diff) | |
| parent | caf98a6468dcea5ae8c38062e4eb527cb3667db9 (diff) | |
Merge branch 'hotfixes' into beta
Conflicts:
CHANGELOG
README.fr.md
README.md
constants.php
Diffstat (limited to 'app/Models/Feed.php')
| -rw-r--r-- | app/Models/Feed.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 2a5ea45ac..03baf3ad2 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -288,6 +288,8 @@ class FreshRSS_Feed extends Minz_Model { $content .= '<br /><audio lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />'; } elseif (strpos($mime, 'video/') === 0) { $content .= '<br /><video lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />'; + } else { + unset($elinks[$elink]); } } } |