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

calendar merge: bring back event categories

Browse Source
This commit is contained in:
Mario Vavti
2019-04-24 14:48:30 +02:00
parent 79654635d3
commit f616b2d49a
4 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Cdav.php
View File

@@ -952,6 +952,8 @@ class Cdav extends Controller {
$description = ['description', t('Description')];
$location = ['location', t('Location')];
$catsenabled = feature_enabled(local_channel(), 'categories');
require_once('include/acl_selectors.php');
$accesslist = new \Zotlabs\Access\AccessList($channel);
@@ -1001,7 +1003,9 @@ class Cdav extends Controller {
'$allow_cid' => acl2json($permissions['allow_cid']),
'$allow_gid' => acl2json($permissions['allow_gid']),
'$deny_cid' => acl2json($permissions['deny_cid']),
'$deny_gid' => acl2json($permissions['deny_gid'])
'$deny_gid' => acl2json($permissions['deny_gid']),
'$catsenabled' => $catsenabled,
'$categories_label' => t('Categories')
]);
return $o;