Merge pull request #35 - Fixes #3404, #3490

1 files changed, 4 insertions, 17 deletions

diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 0268930bf..975598805 100644
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -3,22 +3,9 @@
  * Messageboard river view
  */
 
-$performed_by = $vars['item']->getSubjectEntity();
-$performed_on = $vars['item']->getObjectEntity();
+$messageboard = $vars['item']->getAnnotation();
 
-$comment = $vars['item']->getAnnotation();
-
-$link = elgg_view('output/url', array(
-	'href' => $performed_on->getURL(),
-	'text' => elgg_echo('messageboard:river:user', array($performed_on->name)),
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $messageboard->value,
 ));
-
-echo elgg_echo("messageboard:river:added");
-echo " $link ";
-echo elgg_echo("messageboard:river:messageboard");
-
-if ($comment) {
-	echo '<div class="elgg-river-content">';
-	echo elgg_get_excerpt($comment->value);
-	echo '</div>';
-}