diff options
| author | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-27 23:47:14 +0000 |
|---|---|---|
| committer | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-27 23:47:14 +0000 |
| commit | acacea5efe76cb56f610ae30c5396e7b63be1e40 (patch) | |
| tree | cd80b3f52e5a3e54c082c1ef1c3e1fff98341bd9 /include | |
| parent | 49b38bd71b27427cad1c390d81bda3b7d38d8393 (diff) | |
| parent | 187f19b1704b8a877b53a3e66c67ec26383a3ee9 (diff) | |
| download | volse-hubzilla-acacea5efe76cb56f610ae30c5396e7b63be1e40.tar.gz volse-hubzilla-acacea5efe76cb56f610ae30c5396e7b63be1e40.tar.bz2 volse-hubzilla-acacea5efe76cb56f610ae30c5396e7b63be1e40.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 11 | ||||
| -rwxr-xr-x | include/items.php | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 78d90a6fc..ec445ba4c 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, @@ -1337,10 +1340,14 @@ function status_editor($a, $x, $popup = false) { call_hooks('jot_networks', $jotnets); } + $sharebutton = (x($x,'button') ? $x['button'] : t('Share')); + $placeholdtext = (x($x,'content_label') ? $x['content_label'] : $sharebutton); + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', - '$share' => (x($x,'button') ? $x['button'] : t('Share')), + '$share' => $sharebutton, + '$placeholdtext' => $placeholdtext, '$webpage' => $webpage, '$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), 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 "; } |