1 files changed, 35 insertions, 36 deletions
diff --git a/actions/widgets/add.php b/actions/widgets/add.php
index 14653eb18..d7b2f291c 100644
--- a/actions/widgets/add.php
+++ b/actions/widgets/add.php
@@ -1,43 +1,42 @@
 <?php
+/**
+ * Elgg widget add action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
 
-	/**
-	 * Elgg widget add action
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+$owner_guid = get_input('owner_guid');
+$handler = get_input('handler');
+$context = get_input('context');
+$show_access = (bool)get_input('show_access', true);
+$column = get_input('column', 1);
+$default_widgets = get_input('default_widgets', 0);
 
-	 * @author Curverider Ltd
+elgg_push_context($context);
+if ($default_widgets) {
+	elgg_push_context('default_widgets');
+}
+elgg_push_context('widgets');
 
-	 * @link http://elgg.org/
-	 */
+if (!empty($owner_guid)) {
+	$owner = get_entity($owner_guid);
+	if ($owner && $owner->canEdit()) {
+		$guid = elgg_create_widget($owner->getGUID(), $handler, $context);
+		if ($guid) {
+			$widget = get_entity($guid);
 
-		$guid = get_input('user');
-		$handler = get_input('handler');
-		$context = get_input('context');
-		$column = get_input('column');
-		
-		$result = false;
-		
-		if (!empty($guid)) {
-			
-			if ($user = get_entity($guid)) {
-				
-				if ($user->canEdit()) {
-					
-					$result = add_widget($user->getGUID(),$handler,$context,0,$column);
-					
-				}
-				
-			}
-			
-		}
-		
-		if ($result) {
-			system_message(elgg_echo('widgets:save:success'));
-		} else {
-			register_error(elgg_echo('widgets:save:failure'));
+			// position the widget
+			$widget->move($column, 0);
+
+			// send widget html for insertion
+			echo elgg_view_entity($widget, array('show_access' => $show_access));
+
+			//system_message(elgg_echo('widgets:add:success'));
+			forward(REFERER);
 		}
-		
-		forward($_SERVER['HTTP_REFERER']);
+	}
+}
 
-?>
-\ No newline at end of file
+register_error(elgg_echo('widgets:add:failure'));
+forward(REFERER);