aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-28 18:01:51 -0800
committerzotlabs <mike@macgirvin.com>2018-02-28 18:01:51 -0800
commit1c07880c0178bbda875bbe2cda5d19ae7fb5e1c4 (patch)
treede2f049601ded033a3c83ac6be0f0b52feca4b5b /Zotlabs/Module
parent029d155a07e4d2a0af82a19d3234cee50b57a085 (diff)
downloadvolse-hubzilla-1c07880c0178bbda875bbe2cda5d19ae7fb5e1c4.tar.gz
volse-hubzilla-1c07880c0178bbda875bbe2cda5d19ae7fb5e1c4.tar.bz2
volse-hubzilla-1c07880c0178bbda875bbe2cda5d19ae7fb5e1c4.zip
important bugfix: if logged in locally and mod_display returns nothing owned by your uid, retry with known public uids rather than issue 'permission denied'. Affects the ability to view search results for otherwise public posts 'in context'.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Display.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 11dd0d174..8e8a1ed24 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -215,6 +215,7 @@ class Display extends \Zotlabs\Web\Controller {
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start']));
if($load || ($checkjs->disabled()) || ($module_format !== 'html')) {
+
$r = null;
require_once('include/channel.php');
@@ -235,7 +236,7 @@ class Display extends \Zotlabs\Web\Controller {
}
}
- if($r === null) {
+ if(! $r) {
// in case somebody turned off public access to sys channel content using permissions
// make that content unsearchable by ensuring the owner uid can't match
@@ -281,7 +282,7 @@ class Display extends \Zotlabs\Web\Controller {
}
}
- if($r === null) {
+ if(! $r) {
// in case somebody turned off public access to sys channel content using permissions
// make that content unsearchable by ensuring the owner_xchan can't match
if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))