Fixes #4001. Activity widget passes a context so correct output is displayed upon save.

1 files changed, 13 insertions, 0 deletions

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";