aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-29 13:40:30 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-29 13:40:30 +0000
commitea73090084023d4e18b68f5010c2eae2fa6e9f7f (patch)
tree0dcf7cd3155ae72173aadc05d141cd5fb7a80508
parent74f92a9f12c1411da76abd501cafe240e2b9046d (diff)
downloadelgg-ea73090084023d4e18b68f5010c2eae2fa6e9f7f.tar.gz
elgg-ea73090084023d4e18b68f5010c2eae2fa6e9f7f.tar.bz2
Visual upgrader.
git-svn-id: https://code.elgg.org/elgg/trunk@2345 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--_graphics/upgrader.gifbin0 -> 1924 bytes
-rw-r--r--languages/en.php3
-rw-r--r--upgrade.php13
3 files changed, 11 insertions, 5 deletions
diff --git a/_graphics/upgrader.gif b/_graphics/upgrader.gif
new file mode 100644
index 000000000..8690f43fa
--- /dev/null
+++ b/_graphics/upgrader.gif
Binary files differ
diff --git a/languages/en.php b/languages/en.php
index 7edefe9cd..ea0c8259c 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -712,7 +712,8 @@ Alternatively, you can enter your database settings below and we will try and do
'installation:disableapi' => "Elgg comes with an flexible and extendible API that enables applications use certain Elgg features remotely",
'installation:disableapi:label' => "Enable the RESTful API",
-
+
+ 'upgrading' => 'Upgrading',
'upgrade:db' => 'Your database was upgraded.',
'upgrade:core' => 'Your elgg installation was upgraded',
diff --git a/upgrade.php b/upgrade.php
index ba979f89f..f453cd0ea 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -14,10 +14,15 @@
*/
// Include elgg engine
- require_once(dirname(__FILE__) . "/engine/start.php");
-
- if (version_upgrade_check()) {
- version_upgrade();
+ require_once(dirname(__FILE__) . "/engine/start.php");
+
+ if (get_input('upgrade') == 'upgrade') {
+ if (version_upgrade_check()) {
+ version_upgrade();
+ }
+ } else {
+ global $CONFIG;
+ echo elgg_view('settings/upgrading');
}
forward();