Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

3 files changed, 18 insertions, 4 deletions

diff --git a/views/default/widgets/content_stats/content.php b/views/default/widgets/content_stats/content.php
index 6a652166c..56772047d 100644
--- a/views/default/widgets/content_stats/content.php
+++ b/views/default/widgets/content_stats/content.php
@@ -23,5 +23,6 @@ echo '<div class="mtm">';
 echo elgg_view('output/url', array(
 	'href' => 'admin/statistics/overview',
 	'text' => elgg_echo('more'),
+	'is_trusted' => true,
 ));
 echo '</div>';
diff --git a/views/default/widgets/river_widget/content.php b/views/default/widgets/river_widget/content.php
index 427fd92bf..867fc9db6 100644
--- a/views/default/widgets/river_widget/content.php
+++ b/views/default/widgets/river_widget/content.php
@@ -10,13 +10,13 @@ $options = array(
 	'pagination' => false,
 );
 
-if (elgg_in_context('profile')) {
-	$options['subject_guid'] = elgg_get_page_owner_guid();
-} else {
+if (elgg_in_context('dashboard')) {
 	if ($vars['entity']->content_type == 'friends') {
-		$options['relationship_guid'] = elgg_get_logged_in_user_guid();
+		$options['relationship_guid'] = elgg_get_page_owner_guid();
 		$options['relationship'] = 'friend';
 	}
+} else {
+	$options['subject_guid'] = elgg_get_page_owner_guid();
 }
 
 $content = elgg_list_river($options);
diff --git a/views/default/widgets/river_widget/edit.php b/views/default/widgets/river_widget/edit.php
index e0351e883..228212e47 100644
--- a/views/default/widgets/river_widget/edit.php
+++ b/views/default/widgets/river_widget/edit.php
@@ -43,3 +43,16 @@ $num_dropdown = elgg_view('input/dropdown', $params);
 	<?php echo elgg_echo('widget:numbertodisplay'); ?>:
 	<?php echo $num_dropdown; ?>
 </div>
+
+<?php
+// pass the context so we have the correct output upon save.
+if (elgg_in_context('dashboard')) {
+	$context = 'dashboard';
+} else {
+	$context = 'profile';
+}
+
+echo elgg_view('input/hidden', array(
+	'name' => 'context',
+	'value' => $context
+));
\ No newline at end of file