aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-08-21 02:01:41 -0700
committerzotlabs <mike@macgirvin.com>2017-08-21 02:01:41 -0700
commit9d5b6858ea627b5eb6115cacd870ef0277f87b2a (patch)
tree3f0ea38b5e31ef03299ed864f8ce8000c5125e1b /include
parent7a405da3b7b8cb838fa1dddca3860c6b5d9a05df (diff)
downloadvolse-hubzilla-9d5b6858ea627b5eb6115cacd870ef0277f87b2a.tar.gz
volse-hubzilla-9d5b6858ea627b5eb6115cacd870ef0277f87b2a.tar.bz2
volse-hubzilla-9d5b6858ea627b5eb6115cacd870ef0277f87b2a.zip
stream_perms_xchans wasn't working which has effects in mod_display and there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested
Diffstat (limited to 'include')
-rw-r--r--include/security.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/security.php b/include/security.php
index 6e7b3dbb2..16c6f1680 100644
--- a/include/security.php
+++ b/include/security.php
@@ -640,7 +640,7 @@ function stream_perms_xchans($perms = NULL ) {
if(local_channel())
$ret[] = get_observer_hash();
- $x = q("select uid from pconfig where cat = 'perm_limits' and k = 'view_stream' ");
+ $x = q("select uid, v from pconfig where cat = 'perm_limits' and k = 'view_stream' ");
if($x) {
$y = [];
foreach($x as $xv) {
@@ -650,6 +650,7 @@ function stream_perms_xchans($perms = NULL ) {
}
if($y) {
$ids = ids_to_querystr($y,'uid');
+
$r = q("select channel_hash from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 ",
intval(PAGE_ADULT|PAGE_CENSORED)
);