diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-06-23 21:15:26 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-06-23 21:15:26 +0200 |
| commit | dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879 (patch) | |
| tree | 5fb84907619bdc02c7434dcf6318bbbae5786dfe /Zotlabs/Widget | |
| parent | cf791a19099e0e4a8a0679e720a4f99755083cca (diff) | |
| parent | 6e91bee0ba605b938bddf0570e747d6d7be1c712 (diff) | |
| download | volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.tar.gz volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.tar.bz2 volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Hq_controls.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Widget/Messages.php | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php index 8c36b8d3a..9504b8f9e 100644 --- a/Zotlabs/Widget/Hq_controls.php +++ b/Zotlabs/Widget/Hq_controls.php @@ -7,7 +7,7 @@ use Zotlabs\Lib\Apps; class Hq_controls { - function widget($arr) { + function widget($options) { if (! local_channel()) return; @@ -17,7 +17,7 @@ class Hq_controls { 'label' => t('Toggle post editor'), 'id' => 'jot-toggle', 'href' => '#', - 'class' => 'btn btn-outline-primary', + 'class' => 'btn', 'type' => 'button', 'icon' => 'pencil', 'extra' => 'data-toggle="button"' @@ -29,7 +29,7 @@ class Hq_controls { 'label' => t('Toggle personal notes'), 'id' => 'notes-toggle', 'href' => '#', - 'class' => 'btn btn-outline-primary', + 'class' => 'btn', 'type' => 'button', 'icon' => 'sticky-note-o', 'extra' => 'data-toggle="button"' @@ -38,7 +38,9 @@ class Hq_controls { return replace_macros(get_markup_template('hq_controls.tpl'), [ - '$entries' => $entries + '$entries' => $entries, + '$wrapper_class' => $options['wrapper_class'], + '$entry_class' => $options['entry_class'] ] ); } diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php index a03238c9a..95f3d4eb6 100644 --- a/Zotlabs/Widget/Messages.php +++ b/Zotlabs/Widget/Messages.php @@ -95,7 +95,7 @@ class Messages { $summary = $item['summary']; } if (!$summary) { - $summary = htmlentities(html2plain(bbcode($item['body']), 75, true), ENT_QUOTES, 'UTF-8', false); + $summary = htmlentities(html2plain(bbcode($item['body'], ['drop_media' => true]), 75, true), ENT_QUOTES, 'UTF-8', false); } if (!$summary) { $summary = '...'; |