issue #178, searching for words such as 'data' would return private items regardless of their unobscured content.

1 files changed, 4 insertions, 2 deletions

diff --git a/mod/search.php b/mod/search.php
index e235f720a..6d79f5eee 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -153,24 +153,26 @@ function search_content(&$a,$update = 0, $load = false) {
 			}
 			if(local_channel()) {
 				$r = q("SELECT $prefix mid, item.id as item_id, item.* from item
-					WHERE item_restrict = 0
+					WHERE item_restrict = 0 AND ( item_flags & %d ) = 0
 					AND ((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND item_private = 0 ) 
 					OR ( `item`.`uid` = %d )) OR item.owner_xchan = '%s' )
 					$sql_extra
 					$suffix $pager_sql ",
+					intval(ITEM_OBSCURED),
 					intval(local_channel()),
 					dbesc($sys['xchan_hash'])
 				);
 			}
 			if($r === null) {
 				$r = q("SELECT $prefix mid, item.id as item_id, item.* from item
-					WHERE item_restrict = 0
+					WHERE item_restrict = 0 AND ( item_flags & %d ) = 0
 					AND (((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = ''
 					AND `item`.`deny_gid`  = '' AND item_private = 0 )
 					and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 						$pub_sql ) OR owner_xchan = '%s')
 					$sql_extra 
 					$suffix $pager_sql",
+					intval(ITEM_OBSCURED),
 					dbesc($sys['xchan_hash'])
 				);
 			}