harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hubzilla issue #890, separate the pdl preview feature from the mod_page webpage query so that the webpage will always win if a webpage and pdl have the same name.

Browse Source
This commit is contained in:
zotlabs 2017-10-25 22:33:03 -07:00
parent dafe0a5547
commit 4a3149d1ba
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Zotlabs/Module/Page.php
View File

@ -89,22 +89,30 @@ class Page extends \Zotlabs\Web\Controller {
if(! $ignore_language) { if(! $ignore_language) {
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid $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 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 ) and iconfig.k = 'WEBPAGE' and item_type = %d
OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", $sql_options $revision limit 1",
intval($u[0]['channel_id']), intval($u[0]['channel_id']),
dbesc($lang_page_id), dbesc($lang_page_id),
intval(ITEM_TYPE_WEBPAGE), intval(ITEM_TYPE_WEBPAGE)
intval(ITEM_TYPE_PDL)
); );
} }
if(! $r) { if(! $r) {
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid $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 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 ) and iconfig.k = 'WEBPAGE' and item_type = %d
OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
intval($u[0]['channel_id']), intval($u[0]['channel_id']),
dbesc($page_id), dbesc($page_id),
intval(ITEM_TYPE_WEBPAGE), intval(ITEM_TYPE_WEBPAGE)
);
}
if(! $r) {
// no webpage by that name, but we do allow you to load/preview a layout using this module. Try that.
$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 = 'PDL' AND item_type = %d $sql_options $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
intval(ITEM_TYPE_PDL) intval(ITEM_TYPE_PDL)
); );
} }
@ -129,7 +137,7 @@ class Page extends \Zotlabs\Web\Controller {
} }
return; return;
} }
if($r[0]['title']) if($r[0]['title'])
\App::$page['title'] = escape_tags($r[0]['title']); \App::$page['title'] = escape_tags($r[0]['title']);