diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
| commit | 844bef5070b071aa5ddf823036d2fe2285b40a7b (patch) | |
| tree | 129a67cbed69c4ed6f286e9a0bf3770b9c82ffc6 /Zotlabs/Module/Display.php | |
| parent | 97e329906e3cde0bacafcceb94780bedd44f1f32 (diff) | |
| parent | 6210b7727f6c8542daaa62d1ed7f9ec1f74323f2 (diff) | |
| download | volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.gz volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.bz2 volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.zip | |
Merge branch 'dev' into 3.2RC
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 5 |
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')) |