diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
| commit | 058f7277b52bdcdb80dc3e28bf0ec93a573195a7 (patch) | |
| tree | 32ca12ca4eb390396e429b1e86fd79de614f2551 /Zotlabs/Module/Display.php | |
| parent | 39fe80a196ee626dda15b5b844dd1d05893f7646 (diff) | |
| parent | 471c3c4d068d1c6d4e149098d400d792fb3550a6 (diff) | |
| download | volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.gz volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.bz2 volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.zip | |
Merge branch 'dev' into oauth2
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')) |