4 files changed, 25 insertions, 16 deletions

diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index 1eda90bee..d9bf6d10e 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -30,7 +30,7 @@ elgg.thewire.init = function() {
  */
 elgg.thewire.textCounter = function(textarea, status, limit) {
 
-	var remaining_chars = limit - textarea.value.length;
+	var remaining_chars = limit - $(textarea).val().length;
 	status.html(remaining_chars);
 
 	if (remaining_chars < 0) {
@@ -83,4 +83,4 @@ elgg.thewire.viewPrevious = function(event) {
 	event.preventDefault();
 }
 
-elgg.register_hook_handler('init', 'system', elgg.thewire.init);
\ No newline at end of file
+elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 3ae347711..2727df60d 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,6 +51,7 @@ $params = array(
 	'content' => thewire_filter($post->description),
 	'tags' => false,
 );
+$params = $params + $vars;
 $list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index d4dac38ee..c3c434858 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -7,18 +7,23 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = thewire_filter($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
+$subject = $vars['item']->getSubjectEntity();
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+));
 
-echo elgg_echo('thewire:river:create');
+$object_link = elgg_view('output/url', array(
+	'href' => "thewire/owner/$subject->username",
+	'text' => elgg_echo('thewire:wire'),
+	'class' => 'elgg-river-object',
+));
 
-echo " $link";
+$summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
 
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'summary' => $summary,
+));
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/reply.php b/mod/thewire/views/default/thewire/reply.php
index 3794e1454..341b691b1 100644
--- a/mod/thewire/views/default/thewire/reply.php
+++ b/mod/thewire/views/default/thewire/reply.php
@@ -5,7 +5,10 @@
 
 $post = $vars['post'];
 $poster = $post->getOwnerEntity();
-
+$poster_details = array(
+	htmlspecialchars($poster->name,  ENT_QUOTES, 'UTF-8'),
+	htmlspecialchars($poster->username,  ENT_QUOTES, 'UTF-8'),
+);
 ?>
-<b><?php echo elgg_echo('thewire:replying', array($poster->name)); ?>: </b>
+<b><?php echo elgg_echo('thewire:replying', $poster_details); ?>: </b>
 <?php echo $post->description;
\ No newline at end of file