one more edge case in the public perms - don't match perms = 0 which is private, this and prior checkin are for issue #114

2 files changed, 4 insertions, 4 deletions

diff --git a/mod/display.php b/mod/display.php
index 476087ce7..c9f6595c6 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -113,18 +113,18 @@ function display_content(&$a, $update = 0, $load = false) {
 				}
 			}
 			if($r === null) {
-dbg(1);
+
 				$r = q("SELECT * from item
 					WHERE item_restrict = 0
 					and mid = '%s'
 					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() . " ))
+					and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
 					$sql_extra )
 					group by mid limit 1",
 					dbesc($target_item['parent_mid'])
 				);
-dbg(0);
+
 			}
 
 		}
diff --git a/mod/search.php b/mod/search.php
index 1cb6cb461..9930db288 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -208,7 +208,7 @@ function search_content(&$a,$update = 0, $load = false) {
                     WHERE item_restrict = 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() . " ))
+                    and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
 					$pub_sql )
                     $sql_extra 
                     group by mid ORDER BY created DESC $pager_sql"