aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-09-18 12:43:45 +0200
committerMario <mario@mariovavti.com>2019-09-18 12:43:45 +0200
commit856d4b39d1eaac93f538de6dd00a476cf89f97f1 (patch)
treee43e4cce11f2063da9dfccd53c4247d402261b85 /Zotlabs
parent01abd73a2aa690e6703a295ad1dc78b96deb3f90 (diff)
parent375c2a87c73b0f5a257000a7ec036b1d16c0092b (diff)
downloadvolse-hubzilla-856d4b39d1eaac93f538de6dd00a476cf89f97f1.tar.gz
volse-hubzilla-856d4b39d1eaac93f538de6dd00a476cf89f97f1.tar.bz2
volse-hubzilla-856d4b39d1eaac93f538de6dd00a476cf89f97f1.zip
Merge branch 'dev' into 'dev'
change event formatting slightly for Zot6 and ActivityStreams. See merge request hubzilla/core!1727
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index f9ec3a677..ed29bfe6d 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -6,6 +6,7 @@ use Zotlabs\Daemon\Master;
use Zotlabs\Web\HTTPSig;
require_once('include/event.php');
+require_once('include/html2plain.php');
class Activity {
@@ -204,7 +205,8 @@ class Activity {
$y = [
'type' => 'Event',
'id' => z_root() . '/event/' . $ev['event_hash'],
- 'summary' => bbcode($ev['summary'], [ 'cache' => true ]),
+ 'name' => $ev['summary'],
+// 'summary' => bbcode($ev['summary'], [ 'cache' => true ]),
// RFC3339 Section 4.3
'startTime' => (($ev['adjust']) ? datetime_convert('UTC','UTC',$ev['dtstart'], ATOM_TIME) : datetime_convert('UTC','UTC',$ev['dtstart'],'Y-m-d\\TH:i:s-00:00')),
'content' => bbcode($ev['description'], [ 'cache' => true ]),
@@ -2559,7 +2561,12 @@ class Activity {
}
if($event) {
- $event['summary'] = html2bbcode($content['summary']);
+ $event['summary'] = $content['name'];
+ if(! $event['summary']) {
+ if($content['summary']) {
+ $event['summary'] = html2plain($content['summary']);
+ }
+ }
$event['description'] = html2bbcode($content['content']);
if($event['summary'] && $event['dtstart']) {
$content['event'] = $event;