Visual upgrader.

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

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
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();