From f09ec105ae2b73e4a56b04ce87abc5c8d4254158 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Mon, 10 Oct 2011 08:01:17 -0400
Subject: Fixes #3950 falling back to deprecated view when saving a widget

---
 actions/widgets/save.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'actions/widgets')

diff --git a/actions/widgets/save.php b/actions/widgets/save.php
index 0a2de0c4d..dad48b30b 100644
--- a/actions/widgets/save.php
+++ b/actions/widgets/save.php
@@ -16,7 +16,12 @@ $widget = get_entity($guid);
 if ($widget && $widget->saveSettings($params)) {
 	elgg_set_page_owner_guid($widget->getContainerGUID());
 	if (!$default_widgets) {
-		$view = "widgets/$widget->handler/content";
+		if (elgg_view_exists("widgets/$widget->handler/content")) {
+			$view = "widgets/$widget->handler/content";
+		} else {
+			elgg_deprecated_notice("widgets use content as the display view", 1.8);
+			$view = "widgets/$widget->handler/view";
+		}
 		echo elgg_view($view, array('entity' => $widget));
 	}
 } else {
-- 
cgit v1.2.3


From a50dd81e3737d8dc14f4a700255b3a19c58988b1 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Sat, 29 Oct 2011 19:19:48 -0700
Subject: Fixes #4001. Activity widget passes a context so correct output is
 displayed upon save.

---
 actions/widgets/save.php                       | 13 +++++++++++++
 views/default/widgets/river_widget/content.php |  8 ++++----
 views/default/widgets/river_widget/edit.php    | 13 +++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'actions/widgets')

diff --git a/actions/widgets/save.php b/actions/widgets/save.php
index dad48b30b..e15deab77 100644
--- a/actions/widgets/save.php
+++ b/actions/widgets/save.php
@@ -4,6 +4,14 @@
  *
  * @package Elgg.Core
  * @subpackage Widgets.Management
+ *
+ * @uses int    $_REQUEST['guid']            The guid of the widget to save
+ * @uses array  $_REQUEST['params']          An array of params to set on the widget.
+ * @uses int    $_REQUEST['default_widgets'] Flag for if these settings are for default wigets.
+ * @uses string $_REQUEST['context']         An optional context of the widget. Used to return
+ *                                           the correct output if widget content changes
+ *                                           depending on context.
+ *
  */
 
 elgg_set_context('widgets');
@@ -11,10 +19,15 @@ elgg_set_context('widgets');
 $guid = get_input('guid');
 $params = get_input('params');
 $default_widgets = get_input('default_widgets', 0);
+$context = get_input('context');
 
 $widget = get_entity($guid);
 if ($widget && $widget->saveSettings($params)) {
 	elgg_set_page_owner_guid($widget->getContainerGUID());
+	if ($context) {
+		elgg_push_context($context);
+	}
+	
 	if (!$default_widgets) {
 		if (elgg_view_exists("widgets/$widget->handler/content")) {
 			$view = "widgets/$widget->handler/content";
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
-- 
cgit v1.2.3