diff options
| -rw-r--r-- | Zotlabs/Module/Item.php | 24 | ||||
| -rw-r--r-- | include/conversation.php | 5 | ||||
| -rwxr-xr-x | include/items.php | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 4131bab03..a86106b6a 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -736,10 +736,21 @@ class Item extends \Zotlabs\Web\Controller { $parent_mid = $parent_item['mid']; + + // Fallback so that we alway have a thr_parent + + if(!$thr_parent) + $thr_parent = $mid; + + $datarray = array(); + + $item_thread_top = ((! $parent) ? 1 : 0); + + // fix permalinks for cards - if($webpage == ITEM_TYPE_CARD && $pagetitle) { - $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle; + 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", @@ -750,15 +761,6 @@ class Item extends \Zotlabs\Web\Controller { } } - // Fallback so that we alway have a thr_parent - - if(!$thr_parent) - $thr_parent = $mid; - - $datarray = array(); - - $item_thread_top = ((! $parent) ? 1 : 0); - if ((! $plink) && ($item_thread_top)) { $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid; } diff --git a/include/conversation.php b/include/conversation.php index 2d5ccb5b1..5cb85c3f9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,6 +703,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $is_new = true; + $conv_link = (($item['item_type'] == ITEM_TYPE_CARD) ? $item['plink'] : z_root() . '/display/' . gen_link_id($item['mid'])); + + $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -757,7 +760,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'like' => '', 'dislike' => '', 'comment' => '', - 'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . gen_link_id($item['mid']), 'title'=> t('View in context'))), + 'conv' => (($preview) ? '' : array('href'=> $conv_link, 'title'=> t('View in context'))), 'previewing' => $previewing, 'wait' => t('Please wait'), 'thread_level' => 1, diff --git a/include/items.php b/include/items.php index 070c4571a..8489ec162 100755 --- a/include/items.php +++ b/include/items.php @@ -177,7 +177,7 @@ function item_normal() { } function item_normal_search() { - return " and item.item_hidden = 0 and item.item_type in (0,3) and item.item_deleted = 0 + return " and item.item_hidden = 0 and item.item_type in (0,3,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 "; } |