fixed group forum discussion inline replies for activity page

diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index f92e54a5c53cec21403f8a25735277ec2b8d859a..80e7b09aa2b7d4d3dcb5050c1df38d2576e44679 100644 (file)
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -7,7 +7,16 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
+$responses = '';
+if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
+       // inline comment form
+       $form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden');
+       $body_vars = array('entity' => $object, 'inline' => true);
+       $responses = elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
+}
+
 echo elgg_view('river/item', array(
        'item' => $vars['item'],
        'message' => $excerpt,
+       'responses' => $responses,
 ));

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index 080c046446715ad03317514abbecd3dbd4cd5e16..7eebb0c99accb9082fd9ca2755acb2fd78162bc8 100644 (file)
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -32,7 +32,13 @@ if ($attachments !== false) {
        $attachments = "<div class=\"elgg-river-attachments\">$attachments</div>";
 }
 
-$responses = elgg_view('river/elements/responses', $vars);
+$responses = elgg_extract('responses', $vars, false);
+if ($responses === false) {
+       $responses = elgg_view('river/elements/responses', $vars);
+}
+if ($responses) {
+       $responses = "<div class=\"elgg-river-responses\">$responses</div>";
+}
 
 $group_string = '';
 $object = $item->getObjectEntity();