Updates to: site nav (changed unused id's to title tags), latest wire post in admin/user lists, riverdashboard timestamps unified, and latest wire post on profile page.

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

2 files changed, 5 insertions, 1 deletions

diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php
index bd7d7b5e5..c767d5ad7 100755
--- a/mod/profile/views/default/profile/profile_contents/activity.php
+++ b/mod/profile/views/default/profile/profile_contents/activity.php
@@ -10,6 +10,10 @@
 		// users last status msg, if they posted one
 		echo elgg_view("profile/status", array("entity" => $vars['entity']));
 	}
+	if(is_plugin_enabled('conversations')) {
+		// users last status msg, if they posted one
+		echo elgg_view("profile/status", array("entity" => $vars['entity']));
+	}
 	if(is_plugin_enabled('riverdashboard')) {
 		// users last 10 activites
 		echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index eabe48e53..d2d826ea6 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -104,7 +104,7 @@ else
 			//display the comment link
 		if($vars['item']->type != 'user'){
 			//for now don't display the comment link on bookmarks and wire messages
-			if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '')
+			if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'conversations' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '')
 				echo "<a class='comment_link' href=\"{$object_url}\">Comment</a>";
 			}
 		?>