diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
| commit | c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch) | |
| tree | a13c2d56c1b14ba99a853fb7494a9214d075554d /Zotlabs/Module/Wiki.php | |
| parent | 2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff) | |
| parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
| download | volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2 volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip | |
resolve merge conflict
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 5397deebe..d42c26681 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -45,6 +45,11 @@ class Wiki extends \Zotlabs\Web\Controller { } + if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'view_wiki')) { + notice( t('Permission denied.') . EOL); + return; + } + // TODO: Combine the interface configuration into a unified object // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) @@ -309,7 +314,11 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - + if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'write_wiki')) { + notice( t('Permission denied.') . EOL); + return; + } + // /wiki/channel/preview // Render mardown-formatted text in HTML for preview if((argc() > 2) && (argv(2) === 'preview')) { |