aboutsummaryrefslogtreecommitdiffstats
path: root/include/wiki.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-13 15:15:37 -0800
committerzotlabs <mike@macgirvin.com>2016-12-13 15:15:37 -0800
commit23823811e9fcef166f961e5202bab56fc444dae0 (patch)
tree8547e5384f8f742447ab52a9314ed79215a753a4 /include/wiki.php
parentca44ce5f8cb5ab78d8d5f33c71f29d943ea91a8e (diff)
parentdce03a36d01efdb0b9882782d1a4575515441127 (diff)
downloadvolse-hubzilla-23823811e9fcef166f961e5202bab56fc444dae0.tar.gz
volse-hubzilla-23823811e9fcef166f961e5202bab56fc444dae0.tar.bz2
volse-hubzilla-23823811e9fcef166f961e5202bab56fc444dae0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/wiki.php')
-rw-r--r--include/wiki.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/wiki.php b/include/wiki.php
index 30685a0bf..332d4efe0 100644
--- a/include/wiki.php
+++ b/include/wiki.php
@@ -14,12 +14,13 @@ function wiki_list($channel, $observer_hash) {
intval($channel['channel_id'])
);
if($wikis) {
- foreach($wikis as &$w) {
+ foreach($wikis as &$w) {
$w['rawName'] = get_iconfig($w, 'wiki', 'rawName');
$w['htmlName'] = get_iconfig($w, 'wiki', 'htmlName');
$w['urlName'] = get_iconfig($w, 'wiki', 'urlName');
$w['path'] = get_iconfig($w, 'wiki', 'path');
$w['mimeType'] = get_iconfig($w, 'wiki', 'mimeType');
+ $w['lock'] = (($w['allow_cid'] || $w['allow_gid'] || $w['deny_cid'] || $w['deny_gid']) ? true : false);
}
}
// TODO: query db for wikis the observer can access. Return with two lists, for read and write access