harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
changes to support direct messages in zot6 (set item.item_private = 2 when...

See merge request hubzilla/core!1679
This commit is contained in:
Mario
2019-06-20 17:32:10 +02:00
parent 8c92b0cd3a 952e466d91
commit 5b727065cf
9 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Channel_calendar.php
View File

@@ -381,7 +381,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'end' => $end,
'drop' => $drop,
'allDay' => (($rr['adjust']) ? 0 : 1),
'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false),
'title' => html_entity_decode($rr['summary'],ENT_COMPAT,'UTF-8'),
'editable' => $edit ? true : false,
'item' => $rr,
'plink' => [$rr['plink'], t('Link to source')],
@@ -402,7 +402,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
echo ical_wrapper($r);
killme();
}
if (\App::$argv[1] === 'json'){
json_return_and_die($events);
}