Merge branch 'dspr' into red

2 files changed, 6 insertions, 0 deletions

diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 519102d24..7786ec25a 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -75,6 +75,8 @@ class NativeWiki {
 		$arr['obj_type'] = ACTIVITY_OBJ_WIKI;
 		$arr['body'] = '[table][tr][td][h1]New Wiki[/h1][/td][/tr][tr][td][zrl=' . $wiki_url . ']' . $wiki['htmlName'] . '[/zrl][/td][/tr][/table]';
 
+		$arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_wiki'),true);
+
 		// Save the wiki name information using iconfig. This is shareable.
 		if(! set_iconfig($arr, 'wiki', 'rawName', $wiki['rawName'], true)) {
 			return array('item' => null, 'success' => false);
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 25e454cb7..941ade90c 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -64,6 +64,8 @@ class NativeWikiPage {
 		$arr['deny_cid']      = $w['wiki']['deny_cid'];
 		$arr['deny_gid']      = $w['wiki']['deny_gid'];
 
+		$arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel_id,'view_wiki'),true);
+
 		// We may wish to change this some day.
 		$arr['item_unpublished'] = 1;
 
@@ -233,6 +235,7 @@ class NativeWikiPage {
 		}
 
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
+
 		if($revision == (-1))
 			$sql_extra .= " order by revision desc ";
 		elseif($revision)
@@ -285,6 +288,7 @@ class NativeWikiPage {
 		}
 
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
+
 		$sql_extra .= " order by revision desc ";
 
 		$r = null;