mirror of
https://github.com/friendica/friendica
synced 2024-10-16 08:31:32 +02:00
Merge pull request #10130 from annando/bbcode
Remove empty lines around the horizontal ruler, no maximum height
This commit is contained in:
commit
9cfa0dc2c4
|
@ -50,7 +50,7 @@ use Friendica\Util\XML;
|
|||
class BBCode
|
||||
{
|
||||
// Update this value to the current date whenever changes are made to BBCode::convert
|
||||
const VERSION = '2021-04-05';
|
||||
const VERSION = '2021-04-07';
|
||||
|
||||
const INTERNAL = 0;
|
||||
const API = 2;
|
||||
|
@ -1404,10 +1404,14 @@ class BBCode
|
|||
$search = ["\n[th]", "[th]\n", " [th]", "\n[/th]", "[/th]\n", "[/th] ",
|
||||
"\n[td]", "[td]\n", " [td]", "\n[/td]", "[/td]\n", "[/td] ",
|
||||
"\n[tr]", "[tr]\n", " [tr]", "[tr] ", "\n[/tr]", "[/tr]\n", " [/tr]", "[/tr] ",
|
||||
"\n[hr]", "[hr]\n", " [hr]", "[hr] ",
|
||||
"\n[attachment ", " [attachment ", "\n[/attachment]", "[/attachment]\n", " [/attachment]", "[/attachment] ",
|
||||
"[table]\n", "[table] ", " [table]", "\n[/table]", " [/table]", "[/table] "];
|
||||
$replace = ["[th]", "[th]", "[th]", "[/th]", "[/th]", "[/th]",
|
||||
"[td]", "[td]", "[td]", "[/td]", "[/td]", "[/td]",
|
||||
"[tr]", "[tr]", "[tr]", "[tr]", "[/tr]", "[/tr]", "[/tr]", "[/tr]",
|
||||
"[hr]", "[hr]", "[hr]", "[hr]",
|
||||
"[attachment ", "[attachment ", "[/attachment]", "[/attachment]", "[/attachment]", "[/attachment]",
|
||||
"[table]", "[table]", "[table]", "[/table]", "[/table]", "[/table]"];
|
||||
do {
|
||||
$oldtext = $text;
|
||||
|
|
|
@ -1801,7 +1801,6 @@ aside .panel-body {
|
|||
word-break: break-word;
|
||||
}
|
||||
.wall-item-content img {
|
||||
max-height: 480px;
|
||||
object-fit: contain;
|
||||
}
|
||||
.wall-item-body > img,
|
||||
|
|
Loading…
Reference in a new issue