The wire can now have comments and likes via the activity stream.

git-svn-id: http://code.elgg.org/elgg/trunk@6571 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 13 insertions, 14 deletions

diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 2366abc4c..8114e969e 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -1,17 +1,16 @@
 <?php
 
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
+$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+$object = get_entity($vars['item']->object_guid);
+$url = $object->getURL();
 
-	$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
-	$desc = $object->description;
-	//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
-	$string .= parse_urls($desc);
-
-	$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class='reply_link'>" . elgg_echo('thewire:reply') . "</a>";
-?>
-
-<?php 
-	echo $string; 
-?>
\ No newline at end of file
+$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
+$desc = $object->description;
+//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+$string .= parse_urls($desc);
+$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>";
+	if (isloggedin()){
+		$string .= "<a class='river_comment_form_button link'>Comment</a>";
+		$string .= elgg_view('likes/forms/link', array('entity' => $object));
+	}
+echo $string;
\ No newline at end of file