aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-09 17:14:14 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-09 17:14:14 +0000
commit472b45795825eb65f68c8835e8f7daeb82598741 (patch)
tree811b4b0bbe0e701c7d0d937a278c344427e169b1 /engine
parent0c4397913c7d313dbf10e9553f46e1d6715c6963 (diff)
downloadelgg-472b45795825eb65f68c8835e8f7daeb82598741.tar.gz
elgg-472b45795825eb65f68c8835e8f7daeb82598741.tar.bz2
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
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/upgrades/2011010101.php18
-rw-r--r--engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php3
2 files changed, 21 insertions, 0 deletions
diff --git a/engine/lib/upgrades/2011010101.php b/engine/lib/upgrades/2011010101.php
index be1adac1a..9dbaff1e4 100644
--- 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 592adb403..7efa687ae 100644
--- 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)");