aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 02c61b688..61d31fef4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -414,8 +414,8 @@ function visible_activity($item) {
}
}
-// if(is_edit_activity($item))
-// return false;
+ if(is_edit_activity($item))
+ return false;
return true;
}
@@ -1312,7 +1312,8 @@ function status_editor($a, $x, $popup = false) {
'$expiryModalOK' => t('OK'),
'$expiryModalCANCEL' => t('Cancel'),
'$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false),
- '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false)
+ '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false),
+ '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0)
));
if ($popup === true) {