aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-22 22:58:59 -0700
committerfriendica <info@friendica.com>2013-09-22 23:00:55 -0700
commita2b20bd58f0b1c466235a96c41846aba613ea31b (patch)
tree32b131945dc26c22e6bf4d51c051f5daea0fa142 /include
parent956d275693c451c4d9ba60751704b80257f37433 (diff)
downloadvolse-hubzilla-a2b20bd58f0b1c466235a96c41846aba613ea31b.tar.gz
volse-hubzilla-a2b20bd58f0b1c466235a96c41846aba613ea31b.tar.bz2
volse-hubzilla-a2b20bd58f0b1c466235a96c41846aba613ea31b.zip
one more edge case in the public perms - don't match perms = 0 which is private, this and prior checkin are for issue #114
Diffstat (limited to 'include')
-rw-r--r--include/security.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/security.php b/include/security.php
index 632b8d607..1181e6bf2 100644
--- a/include/security.php
+++ b/include/security.php
@@ -412,7 +412,7 @@ function stream_perms_api_uids($perms_min = PERMS_SITE) {
$ret = array();
if(local_user())
$ret[] = local_user();
- $r = q("select channel_id from channel where channel_r_stream <= %d",
+ $r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d",
intval($perms_min)
);
if($r)
@@ -435,7 +435,8 @@ function stream_perms_xchans($perms_min = PERMS_SITE) {
$ret = array();
if(local_user())
$ret[] = get_observer_hash();
- $r = q("select channel_hash from channel where channel_r_stream <= %d",
+
+ $r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d",
intval($perms_min)
);
if($r)