diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-14 09:42:43 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-14 09:42:43 +0200 |
| commit | 5c458e9111d8853891a0545d63fe7f55ee0f5a41 (patch) | |
| tree | 01f80be918dd76a58cc1102166c53048631aed8a /Zotlabs/Module/Page.php | |
| parent | b6d425838f9025d8faf6dbfe90fce091d94b3cd7 (diff) | |
| parent | 0ef2622621867fa197988974b47eff85f20a80e7 (diff) | |
| download | volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.gz volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.bz2 volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Page.php')
| -rw-r--r-- | Zotlabs/Module/Page.php | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php index 14273614c..deb23da68 100644 --- a/Zotlabs/Module/Page.php +++ b/Zotlabs/Module/Page.php @@ -65,9 +65,10 @@ class Page extends \Zotlabs\Web\Controller { require_once('include/security.php'); $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 item.item_delayed = 0 and (( service = 'WEBPAGE' and item_type = %d ) - OR ( service = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", + $r = q("select item.* from item left join iconfig on item.id = iconfig.iid + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + and (( iconfig.k = 'WEBPAGE' and item_type = %d ) + OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_TYPE_WEBPAGE), @@ -77,9 +78,9 @@ 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 item.item_delayed = 0 and service = 'WEBPAGE' and - item_type = %d $revision limit 1", + $x = q("select item.* from item left join iconfig on item.id = iconfig.iid + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + and iconfig.k = 'WEBPAGE' and item_type = %d $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_TYPE_WEBPAGE) @@ -119,11 +120,8 @@ class Page extends \Zotlabs\Web\Controller { \App::$data['webpage'] = $r; } - - - - - function get() { + + function get() { $r = \App::$data['webpage']; if(! $r) |