diff options
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1c56fa1bf..7c30c01c2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -225,7 +225,7 @@ function conversation(&$a, $items, $mode, $update) { $comments = array(); foreach($items as $item) { - if(intval($item['gravity']) == 6) { + if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) { if(! x($comments,$item['parent'])) $comments[$item['parent']] = 1; else @@ -294,6 +294,7 @@ function conversation(&$a, $items, $mode, $update) { $comments_seen ++; + $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false); $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false); if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) { @@ -368,7 +369,7 @@ function conversation(&$a, $items, $mode, $update) { )); } - if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) { + if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { $comment = replace_macros($cmnt_tpl,array( '$return_path' => '', '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''), @@ -686,6 +687,7 @@ function status_editor($a,$x) { '$baseurl' => $a->get_baseurl(), '$geotag' => $geotag, '$nickname' => $x['nickname'], + '$ispublic' => t('Visible to <strong>everybody</strong>'), '$linkurl' => t('Please enter a link URL:'), '$utubeurl' => t('Please enter a YouTube link:'), '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"), @@ -744,7 +746,7 @@ function status_editor($a,$x) { '$content' => '', '$post_id' => '', '$baseurl' => $a->get_baseurl(), - '$defloc' => $x['default-location'], + '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], '$emailcc' => t('CC: email addresses'), '$jotnets' => $jotnets, |