From ea73090084023d4e18b68f5010c2eae2fa6e9f7f Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 29 Oct 2008 13:40:30 +0000
Subject: Visual upgrader.

git-svn-id: https://code.elgg.org/elgg/trunk@2345 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 _graphics/upgrader.gif | Bin 0 -> 1924 bytes
 languages/en.php       |   3 ++-
 upgrade.php            |  13 +++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 _graphics/upgrader.gif

diff --git a/_graphics/upgrader.gif b/_graphics/upgrader.gif
new file mode 100644
index 000000000..8690f43fa
Binary files /dev/null and b/_graphics/upgrader.gif 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();
-- 
cgit v1.2.3