diff options
| author | zotlabs <mike@macgirvin.com> | 2018-11-14 17:42:02 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-11-14 17:42:02 -0800 |
| commit | ab2376f8d85877f95c20fad3a3ece4ef517e083b (patch) | |
| tree | 70cf512fc2c4f27de53b240658b89980894d4a21 | |
| parent | 48717dff00a906b8ba8d70b667298fde94492b4f (diff) | |
| download | volse-hubzilla-ab2376f8d85877f95c20fad3a3ece4ef517e083b.tar.gz volse-hubzilla-ab2376f8d85877f95c20fad3a3ece4ef517e083b.tar.bz2 volse-hubzilla-ab2376f8d85877f95c20fad3a3ece4ef517e083b.zip | |
fix dreport link
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 7 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 78714c2c4..93d8aa3a5 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -299,8 +299,10 @@ class ThreadItem { if($keep_reports === 0) $keep_reports = 10; - if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0) + if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0) { $dreport = t('Delivery Report'); + $dreport_link = gen_link_id($item['mid']); + } if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $is_new = true; @@ -316,7 +318,7 @@ class ThreadItem { $owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@')); $viewthread = $item['llink']; if($conv->get_mode() === 'channel') - $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode($item['mid']); + $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid'])); $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : ''); @@ -364,6 +366,7 @@ class ThreadItem { 'thread_action_menu' => thread_action_menu($item,$conv->get_mode()), 'thread_author_menu' => thread_author_menu($item,$conv->get_mode()), 'dreport' => $dreport, + 'dreport_link' => $dreport_link, 'name' => $profile_name, 'thumb' => $profile_avatar, 'osparkle' => $osparkle, diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5720a2a5f..7dddf9c01 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -181,7 +181,7 @@ {{/if}} {{if $item.edpost && $item.dreport}} <div class="dropdown-divider"></div> - <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> + <a class="dropdown-item" href="dreport/{{$item.dreport_link}}">{{$item.dreport}}</a> {{/if}} {{if $item.settings}} <div class="dropdown-divider"></div> |