diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
| commit | 6424bac47ce7f81991d23d2407cbb4c08dbfdf69 (patch) | |
| tree | 5a664f58749fe45923f77881310cdd295859afb5 /Zotlabs/Module/Events.php | |
| parent | a01baab4f0dc1654dfe2d2cc6fc78e5c3c8d9f4e (diff) | |
| parent | bdd7d24ac1ccf8f7c5b8939cf23a6a156da959c1 (diff) | |
| download | volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.gz volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.bz2 volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Events.php')
| -rw-r--r-- | Zotlabs/Module/Events.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 3187cddb4..def5c437b 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -6,7 +6,6 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); -require_once('include/PermissionDescription.php'); class Events extends \Zotlabs\Web\Controller { @@ -471,7 +470,7 @@ class Events extends \Zotlabs\Web\Controller { '$permissions' => t('Permission settings'), // populating the acl dialog was a permission description from view_stream because Cal.php, which // displays events, says "since we don't currently have an event permission - use the stream permission" - '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \PermissionDescription::fromGlobalPermission('view_stream'))), + '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))), '$submit' => t('Submit'), '$advanced' => t('Advanced Options') |