From ba0714fba344c1e76a76ad312a7c0e7152c6981a Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 26 Oct 2006 02:31:50 +0000
Subject: [PATCH] If the installation can only find an older version of the
 "full" installer, then automatically run the update script to get up to the
 newest version

---
 install2.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/install2.php b/install2.php
index 565ae64a..daad3901 100644
--- a/install2.php
+++ b/install2.php
@@ -113,11 +113,16 @@ mysql_select_db($DBNAME);
 					system("mysql -h$DBHOST -u$DBUSER -p$DBPASS $DBNAME <db/db.full.$x.sql");
 
 					echo "<b>Done! installed database version $x</b><br />\n";
-					echo "<b>NOTE: YOU WILL NEED TO RUN THE db_update.php SCRIPT TO MANUALLY UPDATE THE DATABASE FROM $x to $dbcodeversion</b><br />";
 
 					//now update the db version in the database
 					mysql_query("UPDATE config SET val='$x' WHERE var='DBVERSION' AND year='0'");
 
+					echo "<b>Attempting to update database using standard update script to update from $x to $dbcodeversion<br />";
+					echo "<br />Please scroll to the bottom of this page for the link to the next step of the installation process.<br /></b>";
+					chdir ("db");
+					include "db_update.php";
+					chdir ("../");
+
 					echo "<br />";
 					echo "<b>Done!</b><br />";
 					echo "<a href=\"install3.php\">Proceed to installation step 3</a><br />";