Closes #430

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

3 files changed, 30 insertions, 17 deletions

diff --git a/UPGRADE.txt b/UPGRADE.txt
new file mode 100644
index 000000000..4ecd28ba1
--- /dev/null
+++ b/UPGRADE.txt
@@ -0,0 +1,6 @@
+ELGG 1.x UPGRADE INSTRUCTIONS
+
+1. Download the new version of Elgg from elgg.org or a mirror.
+2. Delete your existing elgg files (apart from any files which you have modified - settings.php, custom plugins etc)
+3. Visit http://YOUR.ELGG.SITE/upgrade.php
+
diff --git a/engine/lib/version.php b/engine/lib/version.php
index 4799b1a85..d1ee9c94a 100644
--- a/engine/lib/version.php
+++ b/engine/lib/version.php
@@ -118,21 +118,4 @@
 			

 		}

 		

-	/**

-	 * Runs an upgrade check on boot.

-	 *

-	 */

-		function version_boot() {

-			
-			if (!is_installed()) return false;
-			

-			if (version_upgrade_check()) {

-				version_upgrade();

-			}

-			

-		}

-		

-	// Register the boot handler for version

-		register_elgg_event_handler("boot","system","version_boot");

-

 ?>
\ No newline at end of file
diff --git a/upgrade.php b/upgrade.php
new file mode 100644
index 000000000..ba979f89f
--- /dev/null
+++ b/upgrade.php
@@ -0,0 +1,24 @@
+<?php
+	/**
+	 * Elgg upgrade script.
+	 * 
+	 * This script triggers any upgrades necessary, ensuring that upgrades are triggered deliberately by a single
+	 * user.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Include elgg engine
+	require_once(dirname(__FILE__) . "/engine/start.php");
+
+	if (version_upgrade_check()) {
+		version_upgrade();
+	}
+	
+	forward();
+?>
\ No newline at end of file