diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-10 01:31:15 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-10 01:31:15 -0700 |
| commit | 24698531756a4aeaf6710378c97b857d795c5197 (patch) | |
| tree | bfab4daff0b2344cb09ae7b2ce24834edeaded75 /Zotlabs | |
| parent | 0c5434d5e35f13340df5bf5edd22c6d9e9e8379c (diff) | |
| parent | 8ab77078983470e9c5223edf9d1e7502207f7169 (diff) | |
| download | volse-hubzilla-24698531756a4aeaf6710378c97b857d795c5197.tar.gz volse-hubzilla-24698531756a4aeaf6710378c97b857d795c5197.tar.bz2 volse-hubzilla-24698531756a4aeaf6710378c97b857d795c5197.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Page.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php index 8a8bc7a49..14273614c 100644 --- a/Zotlabs/Module/Page.php +++ b/Zotlabs/Module/Page.php @@ -66,7 +66,7 @@ class Page extends \Zotlabs\Web\Controller { $sql_options = item_permissions_sql($u[0]['channel_id']); $r = q("select item.* from item left join item_id on item.id = item_id.iid - where item.uid = %d and sid = '%s' and (( service = 'WEBPAGE' and item_type = %d ) + where item.uid = %d and sid = '%s' and item.item_delayed = 0 and (( service = 'WEBPAGE' and item_type = %d ) OR ( service = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), @@ -78,7 +78,7 @@ class Page extends \Zotlabs\Web\Controller { // Check again with no permissions clause to see if it is a permissions issue $x = q("select item.* from item left join item_id on item.id = item_id.iid - where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and + where item.uid = %d and sid = '%s' and item.item_delayed = 0 and service = 'WEBPAGE' and item_type = %d $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), |