diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-02-19 12:15:59 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-02-19 12:15:59 +0100 |
| commit | c5bb0745737432c6d27e9468e56ad0bd33698462 (patch) | |
| tree | 7d6b7a364941b9325ea319e6564e9f6123f059f2 /Zotlabs/Module/Oep.php | |
| parent | 4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0 (diff) | |
| parent | cead10b9af6ff9d8b1bc702ca21d27af7c2112f0 (diff) | |
| download | volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.tar.gz volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.tar.bz2 volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Oep.php')
| -rw-r--r-- | Zotlabs/Module/Oep.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 0f20a5f9a..c0d8e15e5 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -181,7 +181,7 @@ class Oep extends \Zotlabs\Web\Controller { dbesc($res) ); if($r) { - $sql_extra = "and item.id = " . intval($r[0]['iid']) . " "; + $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; } else { return $ret; @@ -194,6 +194,9 @@ class Oep extends \Zotlabs\Web\Controller { intval(ITEM_TYPE_CARD) ); + if(! $r) + return; + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; @@ -255,7 +258,6 @@ class Oep extends \Zotlabs\Web\Controller { if(! $channel) return $ret; - if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages')) return $ret; @@ -265,7 +267,7 @@ class Oep extends \Zotlabs\Web\Controller { dbesc($res) ); if($r) { - $sql_extra = "and item.id = " . intval($r[0]['iid']) . " "; + $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; } else { return $ret; @@ -278,6 +280,9 @@ class Oep extends \Zotlabs\Web\Controller { intval(ITEM_TYPE_ARTICLE) ); + if(! $r) + return; + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; |