Fixes #3463 not showing edit icon for widgets when nothing to edit

diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index d1d630c4f404589d079cdf1afadadb0b2befad4e..57a935f623e88d708b55e7189b6217d63d5ca553 100644 (file)
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -8,9 +8,7 @@
 
 echo elgg_view_menu('widget', array(
        'entity' => elgg_extract('widget', $vars),
-       'params' => array(
-               'show_edit' => elgg_extract('show_edit', $vars, true)
-       ),
+       'show_edit' => elgg_extract('show_edit', $vars, true),
        'sort_by' => 'priority',
        'class' => 'elgg-menu-hz',
 ));

diff --git a/views/default/object/widget/elements/settings.php b/views/default/object/widget/elements/settings.php
index 5afe56ed80ed4834c998314259eb3b0e8e5dbae8..25cda58c9952f28491b59d769cfafa454d4a0093 100644 (file)
--- a/views/default/object/widget/elements/settings.php
+++ b/views/default/object/widget/elements/settings.php
@@ -6,8 +6,20 @@
  */
 
 $widget = elgg_extract('widget', $vars);
+
+// not using elgg_view_form() so that we can detect if the form is empty
+$form_body = elgg_view('forms/widgets/save', $vars);
+if (!$form_body) {
+       return true;
+}
+
+$form = elgg_view('input/form', array(
+       'action' => 'action/widgets/save',
+       'body' => $form_body,
+       'class' => 'elgg-form-widgets-save',
+));
 ?>
 
 <div class="elgg-widget-edit" id="widget-edit-<?php echo $widget->guid; ?>">
-       <?php echo elgg_view_form('widgets/save', array(), $vars); ?>
+       <?php echo $form; ?>
 </div>