Fixes #3224 Fixes #3241 stopping upgrade after plugin upgrade and restarting

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

diff --git a/engine/lib/upgrades/2011010101.php b/engine/lib/upgrades/2011010101.php
index be1adac1a9a77352219c6988cb1ab70d6b4aca87..9dbaff1e4c3548b44af50412bfdd1911ccdb4e31 100644 (file)
--- a/engine/lib/upgrades/2011010101.php
+++ b/engine/lib/upgrades/2011010101.php
@@ -73,3 +73,21 @@ remove_metadata($site->guid, 'pluginorder');
 remove_metadata($site->guid, 'enabled_plugins');
 
 elgg_set_ignore_access($old_id);
+
+/**
+ * @hack
+ *
+ * We stop the upgrade at this point because plugins weren't given the chance to
+ * load due to the new plugin code introduced with Elgg 1.8. Instead, we manually
+ * set the version and start the upgrade process again.
+ *
+ * The variables from upgrade_code() are available because this script was included
+ */
+if ($upgrade_version > $version) {
+       datalist_set('version', $upgrade_version);
+}
+
+$processed_upgrades = array_unique($processed_upgrades);
+datalist_set('processed_upgrades', serialize($processed_upgrades));
+
+forward('upgrade.php');

diff --git a/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php b/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php
index 592adb403e3693f668ca2feb39eb00f23c544385..7efa687ae75e32c9e17bc672659e0e698aea9703 100644 (file)
--- a/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php
+++ b/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php
@@ -11,3 +11,6 @@ foreach ($admins as $admin) {
        // call the admin handler for the make_admin event
        elgg_add_admin_widgets('make_admin', 'user', $admin);
 }
+
+// as last upgrade for 1.8.0 (or nearly so) we add a reminder to update .htaccess
+system_message("IMPORTANT: update your .htaccess file (or equivalent)");