aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/deprecated-1.8.php6
-rw-r--r--engine/lib/upgrade.php (renamed from engine/lib/version.php)4
-rw-r--r--engine/start.php2
-rw-r--r--install/ElggInstaller.php2
4 files changed, 10 insertions, 4 deletions
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index dc219ac76..165546d31 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -4372,6 +4372,12 @@ function display_widget(ElggObject $widget) {
/**
+ * ***************************************************************************
+ * NOTE: If this is ever removed from Elgg, sites lose the ability to upgrade
+ * from 1.7.x and earlier to the latest version of Elgg without upgrading to
+ * 1.8 first.
+ * ***************************************************************************
+ *
* Upgrade the database schema in an ordered sequence.
*
* Executes all upgrade files in elgg/engine/schema/upgrades/ in sequential order.
diff --git a/engine/lib/version.php b/engine/lib/upgrade.php
index 27f730c33..159da5da8 100644
--- a/engine/lib/version.php
+++ b/engine/lib/upgrade.php
@@ -1,10 +1,10 @@
<?php
/**
- * Elgg version library.
+ * Elgg upgrade library.
* Contains code for handling versioning and upgrades.
*
* @package Elgg.Core
- * @subpackage Version
+ * @subpackage Upgrade
*/
/**
diff --git a/engine/start.php b/engine/start.php
index 4d8175b60..713d94cc6 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -99,7 +99,7 @@ $lib_files = array(
'opendd.php', 'pagehandler.php', 'pageowner.php', 'pam.php', 'plugins.php',
'private_settings.php', 'relationships.php', 'river.php', 'sites.php',
'statistics.php', 'tags.php', 'user_settings.php', 'users.php',
- 'version.php', 'web_services.php', 'widgets.php', 'xml.php', 'xml-rpc.php',
+ 'upgrade.php', 'web_services.php', 'widgets.php', 'xml.php', 'xml-rpc.php',
//backwards compatibility
'deprecated-1.7.php', 'deprecated-1.8.php',
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 6e946f0d0..1bf4808ef 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -732,7 +732,7 @@ class ElggInstaller {
'pageowner.php', 'pam.php', 'plugins.php',
'private_settings.php', 'relationships.php', 'river.php',
'sites.php', 'statistics.php', 'tags.php', 'user_settings.php',
- 'users.php', 'version.php', 'web_services.php',
+ 'users.php', 'upgrade.php', 'web_services.php',
'widgets.php', 'xml.php', 'xml-rpc.php', 'deprecated-1.7.php',
'deprecated-1.8.php',
);