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

make cards searchable

Browse Source
This commit is contained in:
zotlabs
2017-08-24 18:15:19 -07:00
parent bd84a3ee08
commit 341386a95b
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Zotlabs/Module/Item.php
View File

@@ -736,19 +736,6 @@ class Item extends \Zotlabs\Web\Controller {
$parent_mid = $parent_item['mid'];
// fix permalinks for cards
if($webpage == ITEM_TYPE_CARD && $pagetitle) {
$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle;
}
if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
$r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
intval($parent_item['id'])
);
if($r) {
$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
}
}
// Fallback so that we alway have a thr_parent
@@ -759,6 +746,21 @@ class Item extends \Zotlabs\Web\Controller {
$item_thread_top = ((! $parent) ? 1 : 0);
// fix permalinks for cards
if($webpage == ITEM_TYPE_CARD) {
$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : substr($mid,0,16));
}
if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
$r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
intval($parent_item['id'])
);
if($r) {
$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
}
}
if ((! $plink) && ($item_thread_top)) {
$plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid;
}