From dc9ac0a2c2ae6ca9f9a0240fb4f3ea6e8abfa338 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 29 Jan 2007 13:34:49 +0000 Subject: [PATCH] Fix for #2140 --- .../var/install/upgrade/upgrade-to-1.2.0.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php index 10084dba9..cf756664d 100644 --- a/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php +++ b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php @@ -8,9 +8,6 @@ * @license http://www.gnu.org/licenses/gpl.txt * @link http://www.campware.org * - * Note: This file was broken into two parts: install.php and - * installMain.php so that the archive server could use the same - * installation script, but with just a different config file. */ // Do not allow remote execution @@ -22,19 +19,20 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) { exit(1); } -echo "**********************************\n"; -echo "* StorageServer Upgrade to 1.2.0 *\n"; -echo "**********************************\n"; +echo "*********************************************\n"; +echo "* StorageServer Upgrade from 1.1.X to 1.2.0 *\n"; +echo "*********************************************\n"; require_once(dirname(__FILE__).'/../../conf.php'); require_once(dirname(__FILE__)."/../installInit.php"); +campcaster_db_connect(); require_once(dirname(__FILE__)."/../../StoredFile.php"); // Check to see if upgrade has already been applied $sql = "SELECT md5 FROM ".$CC_CONFIG['filesTable']." LIMIT 1"; $result = $CC_DBC->query($sql); if (!PEAR::isError($result)) { - echo "THIS UPGRADE HAS ALREADY BEEN APPLIED.\n"; + echo " * THIS UPGRADE HAS ALREADY BEEN APPLIED.\n"; exit(0); }