Просмотр исходного кода

Fix newlines not always displaying properly in description (#5859)

* Fix newlines not displaying properly

* Add name to credits

* Restore enclosure-description class

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* Update app/Models/Entry.php

XHTML

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
FireFingers21 2 лет назад
Родитель
Сommit
b1d568697a
4 измененных файлов с 2 добавлено и 9 удалено
  1. 1 0
      CREDITS.md
  2. 1 1
      app/Models/Entry.php
  3. 0 4
      p/themes/base-theme/frss.css
  4. 0 4
      p/themes/base-theme/frss.rtl.css

+ 1 - 0
CREDITS.md

@@ -71,6 +71,7 @@ People are sorted by name so please keep this order.
 * [fabianski7](https://github.com/fabianski7): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:fabianski7)
 * [Fake4d](https://github.com/Fake4d): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Fake4d)
 * [Felix2yu 石渠清心](https://github.com/Felix2yu): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Felix2yu), [Web](https://yufei.im/)
+* [FireFingers21](https://github.com/firefingers21): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:firefingers21)
 * [flo0627](https://github.com/flo0627): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:flo0627)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Frenzie), [Web](http://fransdejonge.com/)
 * [FromTheMoon85](https://github.com/FromTheMoon85): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:FromTheMoon85)

+ 1 - 1
app/Models/Entry.php

@@ -185,7 +185,7 @@ HTML;
 				continue;
 			}
 			$credit = $enclosure['credit'] ?? '';
-			$description = $enclosure['description'] ?? '';
+			$description = nl2br($enclosure['description'] ?? '', true);
 			$length = $enclosure['length'] ?? 0;
 			$medium = $enclosure['medium'] ?? '';
 			$mime = $enclosure['type'] ?? '';

+ 0 - 4
p/themes/base-theme/frss.css

@@ -2096,10 +2096,6 @@ html.slider-active {
 	margin-left: .8em;
 }
 
-.enclosure-description {
-	white-space: pre-line;
-}
-
 .default-user {
 	font-style: italic;
 }

+ 0 - 4
p/themes/base-theme/frss.rtl.css

@@ -2096,10 +2096,6 @@ html.slider-active {
 	margin-right: .8em;
 }
 
-.enclosure-description {
-	white-space: pre-line;
-}
-
 .default-user {
 	font-style: italic;
 }