Fixes #3193 moves default widgets upgrade to an action

git-svn-id: http://code.elgg.org/elgg/trunk@8971 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/upgrades/2011032300-1.8_svn-update_default_widgets-7daf5a459720d06d.php b/actions/widgets/upgrade.php
similarity index 87%
rename from engine/lib/upgrades/2011032300-1.8_svn-update_default_widgets-7daf5a459720d06d.php
rename to actions/widgets/upgrade.php
index 6a5f2fa0210debe99ac66096e28125560400d45f..0a5cf8d48b8fe603ea232e18d21872936dbc592c 100644 (file)
--- a/engine/lib/upgrades/2011032300-1.8_svn-update_default_widgets-7daf5a459720d06d.php
+++ b/actions/widgets/upgrade.php
@@ -1,10 +1,12 @@
 <?php
 /**
- * Elgg 1.8-svn upgrade 2011032300
- * update_default_widgets
+ * Upgrade default widgets for Elgg 1.8
  *
  * Pre-1.8, default widgets were stored as metadata on a defaultwidgets object.
  * Now they are stored as widget objects owned by the site.
+ * 
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
  */
 
 $object = elgg_get_entities(array(
@@ -14,8 +16,7 @@ $object = elgg_get_entities(array(
 ));
 
 if (!$object) {
-       // nothing to upgrade
-       return true;
+       forward(REFERER);
 }
 
 $object = $object[0];
@@ -58,3 +59,7 @@ foreach (array('profile', 'dashboard') as $context) {
        }
 }
 elgg_set_ignore_access($ia);
+
+$object->delete();
+system_message(elgg_echo('upgrade:core'));
+forward(REFERER);

diff --git a/engine/lib/widgets.php b/engine/lib/widgets.php
index b20f92f746ffb402e8e3a4c796f50abb0c901772..cc3cf20e4f03f5256855a6fefc90d52b2c424c63 100644 (file)
--- a/engine/lib/widgets.php
+++ b/engine/lib/widgets.php
@@ -272,6 +272,7 @@ function elgg_widgets_init() {
        elgg_register_action('widgets/add');
        elgg_register_action('widgets/move');
        elgg_register_action('widgets/delete');
+       elgg_register_action('widgets/upgrade', '', 'admin');
 
        run_function_once("elgg_widget_run_once");
 }

diff --git a/languages/en.php b/languages/en.php
index 427452aa929a16c12d6a147c91bd59a5168814d3..86fa9c7e7e1592060a0ee9ef5c9c0349cbe6a2d3 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -795,6 +795,7 @@ $english = array(
        'post' => 'Post',
        'submit' => 'Submit',
        'comment' => 'Comment',
+       'upgrade' => 'Upgrade',
 
        'site' => 'Site',
        'activity' => 'Activity',

diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/appearance/default_widgets.php
index ce9f6a5c2059fd13b40d8cd510a385a561beaca3..5ce0d0acf985ac3a1b88ce51717e57baf9b525cf 100644 (file)
--- a/views/default/admin/appearance/default_widgets.php
+++ b/views/default/admin/appearance/default_widgets.php
@@ -6,6 +6,22 @@
  * @subpackage Administration.DefaultWidgets
  */
 
+$object = elgg_get_entities(array(
+       'type' => 'object',
+       'subtype' => 'moddefaultwidgets',
+       'limit' => 1,
+));
+
+if ($object) {
+       echo elgg_view('output/url', array(
+               'text' => elgg_echo('upgrade'),
+               'href' => 'action/widgets/upgrade',
+               'is_action' => true,
+               'class' => 'elgg_button elgg-button-submit',
+               'title' => 'Upgrade your default widgets to work on Elgg 1.8',
+       ));
+}
+
 elgg_push_context('default_widgets');
 $widget_context = get_input('widget_context');
 $list = elgg_trigger_plugin_hook('get_list', 'default_widgets', null, array());