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/Lib/NativeWiki.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/Lib/NativeWiki.php')
-rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index ccb0ff150..519102d24 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -201,7 +201,7 @@ class NativeWiki { else { // TODO: Create a new permission setting for wiki analogous to webpages. Until // then, use webpage permissions - $write = perm_is_allowed($owner_id, $observer_hash,'write_pages'); + $write = perm_is_allowed($owner_id, $observer_hash,'write_wiki'); return array('read' => true, 'write' => $write, 'success' => true); } } |