missing location after editor was consolidated

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 1c56fa1bfafc506825665348308900a19d591e6d..38816a7d71ca1d2c31de29622c7a59cccca16849 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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'] : ''),
@@ -744,7 +745,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,