Merge remote-tracking branch 'mike/master' into dev

3 files changed, 18 insertions, 10 deletions

diff --git a/include/import.php b/include/import.php
index 91a26b23b..0fc24a26f 100644
--- a/include/import.php
+++ b/include/import.php
@@ -93,7 +93,8 @@ function import_channel($channel, $account_id, $seize, $newname = '') {
 		'channel_w_comment',  'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
 		'channel_w_chat',     'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
 		'channel_a_delegate', 'perm_limits',         'channel_password',  'channel_salt',
-		'channel_moved'
+		'channel_moved',      'channel_primary',     'channel_removed',   'channel_deleted',
+		'channel_system'
 	];
 
 	$clean = array();
diff --git a/include/items.php b/include/items.php
index b0f6a89cf..c817c5afb 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3997,6 +3997,7 @@ function zot_feed($uid, $observer_hash, $arr) {
 	$result = array();
 	$mindate = null;
 	$message_id = null;
+	$wall = true;
 
 	require_once('include/security.php');
 
@@ -4008,6 +4009,10 @@ function zot_feed($uid, $observer_hash, $arr) {
 		$message_id = $arr['message_id'];
 	}
 
+	if(array_key_exists('wall',$arr)) {
+		$wall = intval($arr['wall']);
+	}
+
 	if(! $mindate)
 		$mindate = NULL_DATE;
 
@@ -4036,6 +4041,10 @@ function zot_feed($uid, $observer_hash, $arr) {
 		$limit = '';
 	}
 
+	if($wall) {
+		$sql_extra .= " and item_wall = 1 ";
+	}
+
 
 	$items = [];
 
@@ -4048,7 +4057,6 @@ function zot_feed($uid, $observer_hash, $arr) {
 
 		$r = q("SELECT parent, postopts FROM item
 			WHERE uid IN ( %s )
-			AND item_wall = 1
 			AND item_private = 0
 			$item_normal
 			$sql_extra ORDER BY created ASC $limit",
@@ -4058,7 +4066,6 @@ function zot_feed($uid, $observer_hash, $arr) {
 	else {
 		$r = q("SELECT parent, postopts FROM item
 			WHERE uid = %d
-			AND item_wall = 1
 			$item_normal
 			$sql_extra ORDER BY created ASC $limit",
 			intval($uid)
diff --git a/include/zot.php b/include/zot.php
index e8ac2df02..b29e86dfa 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3573,13 +3573,13 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 			}
 
 			$disallowed = [
-				'channel_id',        'channel_account_id',  'channel_primary',   'channel_prvkey',
-				'channel_address',   'channel_notifyflags', 'channel_removed',   'channel_deleted',
-				'channel_system',    'channel_r_stream',    'channel_r_profile', 'channel_r_abook',
-				'channel_r_storage', 'channel_r_pages',     'channel_w_stream',  'channel_w_wall',
-				'channel_w_comment', 'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
-				'channel_w_chat',    'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
-				'channel_a_delegate'
+				'channel_id',         'channel_account_id',  'channel_primary',   'channel_prvkey',
+				'channel_address',    'channel_notifyflags', 'channel_removed',   'channel_deleted',
+				'channel_system',     'channel_r_stream',    'channel_r_profile', 'channel_r_abook',
+				'channel_r_storage',  'channel_r_pages',     'channel_w_stream',  'channel_w_wall',
+				'channel_w_comment',  'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
+				'channel_w_chat',     'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
+				'channel_a_delegate', 'channel_moved'
 			];
 
 			$clean = array();